Merge branch 'develop' into stable

2 files changed, 13 insertions, 4 deletions

diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 670dc494..e71b21b1 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -20,7 +20,7 @@ namespace StardewModdingAPI
         ** Public
         ****/
         /// <summary>SMAPI's current semantic version.</summary>
-        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.3.0");
+        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.3.1");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.4.1");
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 7d274eb7..4ffe3acd 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -367,14 +367,23 @@ namespace StardewModdingAPI.Framework.ContentManagers
             }
 
             // get from game assets
+            // Map tilesheet keys shouldn't include the "Maps/" prefix (the game will add it automatically) or ".png" extension.
             {
-                string contentKey = Path.Combine("Maps", relativePath);
-                if (contentKey.EndsWith(".png"))
+                string contentKey = relativePath;
+                foreach (char separator in PathUtilities.PossiblePathSeparators)
+                {
+                    if (contentKey.StartsWith($"Maps{separator}"))
+                    {
+                        contentKey = contentKey.Substring(5);
+                        break;
+                    }
+                }
+                if (contentKey.EndsWith(".png", StringComparison.InvariantCultureIgnoreCase))
                     contentKey = contentKey.Substring(0, contentKey.Length - 4);
 
                 try
                 {
-                    this.GameContentManager.Load<Texture2D>(contentKey, this.Language, useCache: true); // no need to bypass cache here, since we're not storing the asset
+                    this.GameContentManager.Load<Texture2D>(Path.Combine("Maps", contentKey), this.Language, useCache: true); // no need to bypass cache here, since we're not storing the asset
                     assetName = contentKey;
                     return true;
                 }