Merge branch 'develop' into stable

Pathoschild · Nov 4, 2024 · f3f4146 · f3f4146
2 parents 7a91eee + 22f64a1
commit f3f4146
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/build/common.targets b/build/common.targets
@@ -7,7 +7,7 @@ repo. It imports the other MSBuild files as needed.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!--set general build properties -->
-    <Version>4.1.0</Version>
+    <Version>4.1.1</Version>
     <Product>SMAPI</Product>
     <LangVersion>latest</LangVersion>
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,6 +1,11 @@
 ← [README](README.md)
 
 # Release notes
+## 4.1.1
+Released 04 November 2024 for Stardew Valley 1.6.9 or later.
+
+* Fixed crash when loading saves containing a custom spouse room loaded from a `.tmx` file.
+
 ## 4.1.0
 Released 04 November 2024 for Stardew Valley 1.6.9 or later. See [release highlights](https://www.patreon.com/posts/115304143).
 

diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "4.1.0",
+    "Version": "4.1.1",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "4.1.0"
+    "MinimumApiVersion": "4.1.1"
 }
diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Save Backup",
     "Author": "SMAPI",
-    "Version": "4.1.0",
+    "Version": "4.1.1",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "4.1.0"
+    "MinimumApiVersion": "4.1.1"
 }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
@@ -49,7 +49,7 @@ internal static class EarlyConstants
     internal static int? LogScreenId { get; set; }
 
     /// <summary>SMAPI's current raw semantic version.</summary>
-    internal static string RawApiVersion = "4.1.0";
+    internal static string RawApiVersion = "4.1.1";
 }
 
 /// <summary>Contains SMAPI's constants and assumptions.</summary>

diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
@@ -402,7 +402,7 @@ private void InitializeBeforeFirstAssetLoaded()
         }
 
         // init TMX support
-        xTile.Format.FormatManager.Instance.RegisterMapFormat(new TMXTile.TMXFormat(Game1.smallestTileSize, Game1.smallestTileSize));
+        xTile.Format.FormatManager.Instance.RegisterMapFormat(new TMXTile.TMXFormat(Game1.smallestTileSize, Game1.smallestTileSize, 1, 1)); // note: don't omit `1, 1`, TMXTile doesn't default them correctly
 
         // load mod data
         ModToolkit toolkit = new();