Merge branch 'develop' into stable

3 files changed, 12 insertions, 9 deletions

diff --git a/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
index de6c024a..ae8f18d2 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
@@ -47,24 +47,21 @@ namespace StardewModdingAPI.Web.Framework.ConfigModels
         /****
         ** Nexus Mods
         ****/
-        /// <summary>The user agent for the Nexus Mods API client.</summary>
-        public string NexusUserAgent { get; set; }
-
         /// <summary>The base URL for the Nexus Mods API.</summary>
         public string NexusBaseUrl { get; set; }
 
-        /// <summary>The URL for a Nexus Mods API query excluding the <see cref="NexusBaseUrl"/>, where {0} is the mod ID.</summary>
+        /// <summary>The URL for a Nexus mod page for the user, excluding the <see cref="NexusBaseUrl"/>, where {0} is the mod ID.</summary>
         public string NexusModUrlFormat { get; set; }
 
+        /// <summary>The URL for a Nexus mod page to scrape for versions, excluding the <see cref="NexusBaseUrl"/>, where {0} is the mod ID.</summary>
+        public string NexusModScrapeUrlFormat { get; set; }
+
         /****
         ** Pastebin
         ****/
         /// <summary>The base URL for the Pastebin API.</summary>
         public string PastebinBaseUrl { get; set; }
 
-        /// <summary>The user agent for the Pastebin API client, where {0} is the SMAPI version.</summary>
-        public string PastebinUserAgent { get; set; }
-
         /// <summary>The user key used to authenticate with the Pastebin API.</summary>
         public string PastebinUserKey { get; set; }
 
diff --git a/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs
index fc3b7dc2..ce4f3cb5 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs
@@ -24,5 +24,8 @@ namespace StardewModdingAPI.Web.Framework.ConfigModels
 
         /// <summary>The repository key for Nexus Mods.</summary>
         public string NexusKey { get; set; }
+
+        /// <summary>The web URL for the wiki compatibility list.</summary>
+        public string WikiCompatibilityPageUrl { get; set; }
     }
 }
diff --git a/src/SMAPI.Web/Framework/ConfigModels/ContextConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs
index 117462f4..3d428015 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/ContextConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs
@@ -1,7 +1,7 @@
 namespace StardewModdingAPI.Web.Framework.ConfigModels
 {
-    /// <summary>The config settings for the app context.</summary>
-    public class ContextConfig // must be public to pass into views
+    /// <summary>The site config settings.</summary>
+    public class SiteConfig // must be public to pass into views
     {
         /*********
         ** Accessors
@@ -11,5 +11,8 @@ namespace StardewModdingAPI.Web.Framework.ConfigModels
 
         /// <summary>The root URL for the log parser.</summary>
         public string LogParserUrl { get; set; }
+
+        /// <summary>Whether to show SMAPI beta versions on the main page, if any.</summary>
+        public bool EnableSmapiBeta { get; set; }
     }
 }