Merge branch 'develop' into stable

3 files changed, 17 insertions, 11 deletions

diff --git a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
index ca156da4..b8b05878 100644
--- a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
@@ -67,10 +67,10 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
 
             // extract mod info
             string url = this.GetModUrl(parsedId);
-            string name = doc.DocumentNode.SelectSingleNode("//meta[@name='twitter:title']").Attributes["content"].Value;
-            if (name.StartsWith("[SMAPI] "))
-                name = name.Substring("[SMAPI] ".Length);
             string version = doc.DocumentNode.SelectSingleNode("//h1/span")?.InnerText;
+            string name = doc.DocumentNode.SelectSingleNode("//h1").ChildNodes[0].InnerText.Trim();
+            if (name.StartsWith("[SMAPI]"))
+                name = name.Substring("[SMAPI]".Length).TrimStart();
 
             // return info
             return page.SetInfo(name: name, version: version, url: url, downloads: Array.Empty<IModDownload>());
diff --git a/src/SMAPI.Web/SMAPI.Web.csproj b/src/SMAPI.Web/SMAPI.Web.csproj
index 23e0340d..72cbc8a9 100644
--- a/src/SMAPI.Web/SMAPI.Web.csproj
+++ b/src/SMAPI.Web/SMAPI.Web.csproj
@@ -12,14 +12,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.4.4" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.12" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.6.0" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.14" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.7.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
     <PackageReference Include="Humanizer.Core" Version="2.8.26" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Markdig" Version="0.20.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
+    <PackageReference Include="Markdig" Version="0.21.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.13" />
     <PackageReference Include="Pathoschild.FluentNexus" Version="1.0.1" />
     <PackageReference Include="Pathoschild.Http.FluentClient" Version="4.0.0" />
diff --git a/src/SMAPI.Web/wwwroot/schemas/content-patcher.json b/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
index 3fd24e4e..e52cd757 100644
--- a/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
+++ b/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
@@ -11,9 +11,9 @@
             "title": "Format version",
             "description": "The format version. You should always use the latest version to enable the latest features and avoid obsolete behavior.",
             "type": "string",
-            "const": "1.17.0",
+            "const": "1.18.0",
             "@errorMessages": {
-                "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.17.0'."
+                "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.18.0'."
             }
         },
         "ConfigSchema": {
@@ -43,6 +43,11 @@
                         "description": "The default values when the field is missing. Can contain multiple comma-delimited values if AllowMultiple is true. If omitted, blank fields are left blank.",
                         "type": "string"
                     },
+                    "Description": {
+                        "title": "Description",
+                        "description": "An optional explanation of the config field for players, shown in UIs like Generic Mod Config Menu.",
+                        "type": "string"
+                    },
 
                     "additionalProperties": false
                 },
@@ -383,7 +388,6 @@
                                 "enum": [
                                     "Action",
                                     "Enabled",
-                                    "FromFile",
                                     "LogName",
                                     "Target",
                                     "Update",
@@ -391,7 +395,8 @@
 
                                     "Entries",
                                     "Fields",
-                                    "MoveEntries"
+                                    "MoveEntries",
+                                    "TextOperations"
                                 ]
                             }
                         }
@@ -427,6 +432,7 @@
                                     "FromArea",
                                     "MapProperties",
                                     "MapTiles",
+                                    "TextOperations",
                                     "ToArea"
                                 ]
                             }