From e3ae54637ff93a1203cbad65a22ed4bceab762e8 Mon Sep 17 00:00:00 2001 From: archification Date: Sat, 23 Mar 2019 11:55:21 -0500 Subject: adding termite support --- src/SMAPI.Installer/unix-launcher.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/SMAPI.Installer/unix-launcher.sh b/src/SMAPI.Installer/unix-launcher.sh index 3c332472..77e44c8b 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 -- cgit From 2800f7a931b56b551df35280134b9d9e4d7e96a6 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Wed, 27 Mar 2019 21:09:02 -0400 Subject: add release note (#633) --- docs/release-notes.md | 6 ++++++ src/SMAPI.Installer/unix-launcher.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/docs/release-notes.md b/docs/release-notes.md index 5e7ca467..d9bc3ad1 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,4 +1,10 @@ # Release notes +## 2.11.2 (upcoming release) +These changes have not been released yet. + +* For players: + * 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 77e44c8b..a98d527d 100644 --- a/src/SMAPI.Installer/unix-launcher.sh +++ b/src/SMAPI.Installer/unix-launcher.sh @@ -81,8 +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'" + elif $COMMAND termite 2>/dev/null; then + termite -e "sh -c 'TERM=xterm $LAUNCHER'" else sh -c 'TERM=xterm $LAUNCHER' fi -- cgit From 5d0cba90a15ee27e14ea0e2cff73db7542cd5762 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Mon, 25 Mar 2019 18:59:36 -0400 Subject: fix error on Mac when a custom map references a vanilla tilesheet that only exists under Content/Maps --- docs/release-notes.md | 1 + src/SMAPI/Framework/ModHelpers/ContentHelper.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/docs/release-notes.md b/docs/release-notes.md index d9bc3ad1..d0578b33 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -3,6 +3,7 @@ These changes have not been released yet. * For players: + * Fixed error when a custom map references certain vanilla tilesheets on MacOS. * Fixed compatibility with Arch Linux. ## 2.11.1 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) -- cgit From 98f58c353e3488ddb87979d406fbfcbe3d3ddb8f Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Mon, 22 Apr 2019 22:05:36 -0400 Subject: prepare for 2.11.2 release --- build/GlobalAssemblyInfo.cs | 4 ++-- docs/release-notes.md | 4 ++-- src/SMAPI.Mods.ConsoleCommands/manifest.json | 4 ++-- src/SMAPI.Mods.SaveBackup/manifest.json | 4 ++-- src/SMAPI/Constants.cs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') 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 d0578b33..c02b2dd2 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,6 +1,6 @@ # Release notes -## 2.11.2 (upcoming release) -These changes have not been released yet. +## 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. 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"); -- cgit