diff --git a/build/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs index 45c4f311..ced7af52 100644 --- a/build/GlobalAssemblyInfo.cs +++ b/build/GlobalAssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Reflection; [assembly: AssemblyProduct("SMAPI")] -[assembly: AssemblyVersion("2.11.1")] -[assembly: AssemblyFileVersion("2.11.1")] +[assembly: AssemblyVersion("2.11.2")] +[assembly: AssemblyFileVersion("2.11.2")] diff --git a/docs/release-notes.md b/docs/release-notes.md index 5e7ca467..c02b2dd2 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,4 +1,11 @@ # Release notes +## 2.11.2 +Released 22 April 2019 for Stardew Valley 1.3.36. + +* For players: + * Fixed error when a custom map references certain vanilla tilesheets on MacOS. + * Fixed compatibility with Arch Linux. + ## 2.11.1 Released 17 March 2019 for Stardew Valley 1.3.36. diff --git a/src/SMAPI.Installer/unix-launcher.sh b/src/SMAPI.Installer/unix-launcher.sh index 3c332472..a98d527d 100644 --- a/src/SMAPI.Installer/unix-launcher.sh +++ b/src/SMAPI.Installer/unix-launcher.sh @@ -81,6 +81,8 @@ else konsole -p Environment=TERM=xterm -e "$LAUNCHER" elif $COMMAND terminal 2>/dev/null; then terminal -e "sh -c 'TERM=xterm $LAUNCHER'" + elif $COMMAND termite 2>/dev/null; then + termite -e "sh -c 'TERM=xterm $LAUNCHER'" else sh -c 'TERM=xterm $LAUNCHER' fi diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json index 1c4ea7d8..c1aabe48 100644 --- a/src/SMAPI.Mods.ConsoleCommands/manifest.json +++ b/src/SMAPI.Mods.ConsoleCommands/manifest.json @@ -1,9 +1,9 @@ { "Name": "Console Commands", "Author": "SMAPI", - "Version": "2.11.1", + "Version": "2.11.2", "Description": "Adds SMAPI console commands that let you manipulate the game.", "UniqueID": "SMAPI.ConsoleCommands", "EntryDll": "ConsoleCommands.dll", - "MinimumApiVersion": "2.11.1" + "MinimumApiVersion": "2.11.2" } diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json index cfffd9c1..1581d139 100644 --- a/src/SMAPI.Mods.SaveBackup/manifest.json +++ b/src/SMAPI.Mods.SaveBackup/manifest.json @@ -1,9 +1,9 @@ { "Name": "Save Backup", "Author": "SMAPI", - "Version": "2.11.1", + "Version": "2.11.2", "Description": "Automatically backs up all your saves once per day into its folder.", "UniqueID": "SMAPI.SaveBackup", "EntryDll": "SaveBackup.dll", - "MinimumApiVersion": "2.11.1" + "MinimumApiVersion": "2.11.2" } diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs index ca541513..cb3aa26e 100644 --- a/src/SMAPI/Constants.cs +++ b/src/SMAPI/Constants.cs @@ -20,7 +20,7 @@ namespace StardewModdingAPI ** Public ****/ /// SMAPI's current semantic version. - public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.11.1"); + public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.11.2"); /// The minimum supported version of Stardew Valley. public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.3.36"); diff --git a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs index 7c353003..8b86fdeb 100644 --- a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs +++ b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs @@ -316,7 +316,7 @@ namespace StardewModdingAPI.Framework.ModHelpers // check relative to content folder { - foreach (string candidateKey in new[] { imageSource, $@"Maps\{imageSource}" }) + foreach (string candidateKey in new[] { imageSource, Path.Combine("Maps", imageSource) }) { string contentKey = candidateKey.EndsWith(".png") ? candidateKey.Substring(0, candidateKey.Length - 4)