Merge branch 'develop' into stable

2 files changed, 22 insertions, 4 deletions

diff --git a/src/SMAPI/Framework/ContentCoordinator.cs b/src/SMAPI/Framework/ContentCoordinator.cs
index 27fb3dbb..77dd6c72 100644
--- a/src/SMAPI/Framework/ContentCoordinator.cs
+++ b/src/SMAPI/Framework/ContentCoordinator.cs
@@ -99,7 +99,17 @@ namespace StardewModdingAPI.Framework
             this.OnLoadingFirstAsset = onLoadingFirstAsset;
             this.FullRootDirectory = Path.Combine(Constants.ExecutionPath, rootDirectory);
             this.ContentManagers.Add(
-                this.MainContentManager = new GameContentManager("Game1.content", serviceProvider, rootDirectory, currentCulture, this, monitor, reflection, this.OnDisposing, onLoadingFirstAsset)
+                this.MainContentManager = new GameContentManager(
+                    name: "Game1.content",
+                    serviceProvider: serviceProvider,
+                    rootDirectory: rootDirectory,
+                    currentCulture: currentCulture,
+                    coordinator: this,
+                    monitor: monitor,
+                    reflection: reflection,
+                    onDisposing: this.OnDisposing,
+                    onLoadingFirstAsset: onLoadingFirstAsset
+                )
             );
             this.VanillaContentManager = new LocalizedContentManager(serviceProvider, rootDirectory);
             this.CoreAssets = new CoreAssetPropagator(this.MainContentManager.AssertAndNormalizeAssetName, reflection);
@@ -111,7 +121,17 @@ namespace StardewModdingAPI.Framework
         {
             return this.ContentManagerLock.InWriteLock(() =>
             {
-                GameContentManager manager = new GameContentManager(name, this.MainContentManager.ServiceProvider, this.MainContentManager.RootDirectory, this.MainContentManager.CurrentCulture, this, this.Monitor, this.Reflection, this.OnDisposing, this.OnLoadingFirstAsset);
+                GameContentManager manager = new GameContentManager(
+                    name: name,
+                    serviceProvider: this.MainContentManager.ServiceProvider,
+                    rootDirectory: this.MainContentManager.RootDirectory,
+                    currentCulture: this.MainContentManager.CurrentCulture,
+                    coordinator: this,
+                    monitor: this.Monitor,
+                    reflection: this.Reflection,
+                    onDisposing: this.OnDisposing,
+                    onLoadingFirstAsset: this.OnLoadingFirstAsset
+                );
                 this.ContentManagers.Add(manager);
                 return manager;
             });
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index af7d90f6..c70820e4 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -88,8 +88,6 @@ namespace StardewModdingAPI.Framework.ModLoading
                                 if (url != null)
                                     updateUrls.Add(url);
                             }
-                            if (mod.DataRecord.AlternativeUrl != null)
-                                updateUrls.Add(mod.DataRecord.AlternativeUrl);
 
                             // default update URL
                             updateUrls.Add("https://smapi.io/mods");