Merge branch 'develop' into stable

1 files changed, 17 insertions, 13 deletions

diff --git a/src/SMAPI.Web/appsettings.json b/src/SMAPI.Web/appsettings.json
index eb6ecc9b..9758f4a7 100644
--- a/src/SMAPI.Web/appsettings.json
+++ b/src/SMAPI.Web/appsettings.json
@@ -13,33 +13,37 @@
       "Default": "Warning"
     }
   },
-  "ModUpdateCheck": {
-    "CacheMinutes": 60,
-    "SemanticVersionRegex": "^(?>(?<major>0|[1-9]\\d*))\\.(?>(?<minor>0|[1-9]\\d*))(?>(?:\\.(?<patch>0|[1-9]\\d*))?)(?:-(?<prerelease>(?>[a-z0-9]+[\\-\\.]?)+))?$",
+  "Context": {
+    "RootUrl": null, // see top note 
+    "LogParserUrl": null // see top note
+  },
+  "ApiClients": {
+    "UserAgent": "SMAPI/{0} (+https://github.com/Pathoschild/SMAPI)",
 
-    "ChucklefishKey": "Chucklefish",
-    "ChucklefishUserAgent": "SMAPI/{0} (+https://github.com/Pathoschild/SMAPI)",
     "ChucklefishBaseUrl": "https://community.playstarbound.com",
     "ChucklefishModPageUrlFormat": "resources/{0}",
 
-    "GitHubKey": "GitHub",
-    "GitHubUserAgent": "SMAPI/{0} (+https://github.com/Pathoschild/SMAPI)",
     "GitHubBaseUrl": "https://api.github.com",
     "GitHubReleaseUrlFormat": "repos/{0}/releases/latest",
     "GitHubAcceptHeader": "application/vnd.github.v3+json",
     "GitHubUsername": null, // see top note
     "GitHubPassword": null, // see top note
 
-    "NexusKey": "Nexus",
     "NexusUserAgent": "Nexus Client v0.63.15",
     "NexusBaseUrl": "http://www.nexusmods.com/stardewvalley",
-    "NexusModUrlFormat": "mods/{0}"
-  },
-  "LogParser": {
-    "SectionUrl": null, // see top note
+    "NexusModUrlFormat": "mods/{0}",
+
     "PastebinBaseUrl": "https://pastebin.com/",
-    "PastebinUserAgent": "SMAPI/{0} (+https://github.com/Pathoschild/SMAPI)",
     "PastebinUserKey": null, // see top note
     "PastebinDevKey": null // see top note
+  },
+
+  "ModUpdateCheck": {
+    "CacheMinutes": 60,
+    "SemanticVersionRegex": "^(?>(?<major>0|[1-9]\\d*))\\.(?>(?<minor>0|[1-9]\\d*))(?>(?:\\.(?<patch>0|[1-9]\\d*))?)(?:-(?<prerelease>(?>[a-z0-9]+[\\-\\.]?)+))?$",
+
+    "ChucklefishKey": "Chucklefish",
+    "GitHubKey": "GitHub",
+    "NexusKey": "Nexus"
   }
 }