Merge branch 'develop' into stable

Pathoschild · Nov 4, 2024 · fd43bc3 · fd43bc3
2 parents f3f4146 + 9801f0b
commit fd43bc3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 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.1</Version>
+    <Version>4.1.2</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,12 @@
 ← [README](README.md)
 
 # Release notes
+## 4.1.2
+Released 04 November 2024 for Stardew Valley 1.6.10 or later.
+
+* Updated for Stardew Valley 1.6.10.
+* Fixed various issues with custom maps loaded from `.tmx` files in Stardew Valley 1.6.9.
+
 ## 4.1.1
 Released 04 November 2024 for Stardew Valley 1.6.9 or later.
 

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.1",
+    "Version": "4.1.2",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "4.1.1"
+    "MinimumApiVersion": "4.1.2"
 }
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.1",
+    "Version": "4.1.2",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "4.1.1"
+    "MinimumApiVersion": "4.1.2"
 }
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.1";
+    internal static string RawApiVersion = "4.1.2";
 }
 
 /// <summary>Contains SMAPI's constants and assumptions.</summary>
@@ -65,10 +65,10 @@ public static class Constants
     public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion(EarlyConstants.RawApiVersion);
 
     /// <summary>The minimum supported version of Stardew Valley.</summary>
-    public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.6.9");
+    public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.6.10");
 
     /// <summary>The minimum supported Stardew Valley build number, or <c>null</c> for any build of <see cref="MinimumGameVersion"/>.</summary>
-    public static int? MinimumGameBuild { get; } = 24308;
+    public static int? MinimumGameBuild { get; } = null;
 
     /// <summary>The maximum supported version of Stardew Valley, if any.</summary>
     public static ISemanticVersion? MaximumGameVersion { get; } = null;

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, 1, 1)); // note: don't omit `1, 1`, TMXTile doesn't default them correctly
+        xTile.Format.FormatManager.Instance.RegisterMapFormat(new TMXTile.TMXFormat(Game1.tileSize / Game1.pixelZoom, Game1.tileSize / Game1.pixelZoom, Game1.pixelZoom, Game1.pixelZoom));
 
         // load mod data
         ModToolkit toolkit = new();