Merge branch 'develop' into stable
This commit is contained in:
commit
e22a542121
|
@ -1,5 +1,5 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyProduct("SMAPI")]
|
[assembly: AssemblyProduct("SMAPI")]
|
||||||
[assembly: AssemblyVersion("2.11.1")]
|
[assembly: AssemblyVersion("2.11.2")]
|
||||||
[assembly: AssemblyFileVersion("2.11.1")]
|
[assembly: AssemblyFileVersion("2.11.2")]
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
# Release notes
|
# 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
|
## 2.11.1
|
||||||
Released 17 March 2019 for Stardew Valley 1.3.36.
|
Released 17 March 2019 for Stardew Valley 1.3.36.
|
||||||
|
|
||||||
|
|
|
@ -81,6 +81,8 @@ else
|
||||||
konsole -p Environment=TERM=xterm -e "$LAUNCHER"
|
konsole -p Environment=TERM=xterm -e "$LAUNCHER"
|
||||||
elif $COMMAND terminal 2>/dev/null; then
|
elif $COMMAND terminal 2>/dev/null; then
|
||||||
terminal -e "sh -c 'TERM=xterm $LAUNCHER'"
|
terminal -e "sh -c 'TERM=xterm $LAUNCHER'"
|
||||||
|
elif $COMMAND termite 2>/dev/null; then
|
||||||
|
termite -e "sh -c 'TERM=xterm $LAUNCHER'"
|
||||||
else
|
else
|
||||||
sh -c 'TERM=xterm $LAUNCHER'
|
sh -c 'TERM=xterm $LAUNCHER'
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"Name": "Console Commands",
|
"Name": "Console Commands",
|
||||||
"Author": "SMAPI",
|
"Author": "SMAPI",
|
||||||
"Version": "2.11.1",
|
"Version": "2.11.2",
|
||||||
"Description": "Adds SMAPI console commands that let you manipulate the game.",
|
"Description": "Adds SMAPI console commands that let you manipulate the game.",
|
||||||
"UniqueID": "SMAPI.ConsoleCommands",
|
"UniqueID": "SMAPI.ConsoleCommands",
|
||||||
"EntryDll": "ConsoleCommands.dll",
|
"EntryDll": "ConsoleCommands.dll",
|
||||||
"MinimumApiVersion": "2.11.1"
|
"MinimumApiVersion": "2.11.2"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"Name": "Save Backup",
|
"Name": "Save Backup",
|
||||||
"Author": "SMAPI",
|
"Author": "SMAPI",
|
||||||
"Version": "2.11.1",
|
"Version": "2.11.2",
|
||||||
"Description": "Automatically backs up all your saves once per day into its folder.",
|
"Description": "Automatically backs up all your saves once per day into its folder.",
|
||||||
"UniqueID": "SMAPI.SaveBackup",
|
"UniqueID": "SMAPI.SaveBackup",
|
||||||
"EntryDll": "SaveBackup.dll",
|
"EntryDll": "SaveBackup.dll",
|
||||||
"MinimumApiVersion": "2.11.1"
|
"MinimumApiVersion": "2.11.2"
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace StardewModdingAPI
|
||||||
** Public
|
** Public
|
||||||
****/
|
****/
|
||||||
/// <summary>SMAPI's current semantic version.</summary>
|
/// <summary>SMAPI's current semantic version.</summary>
|
||||||
public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.11.1");
|
public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("2.11.2");
|
||||||
|
|
||||||
/// <summary>The minimum supported version of Stardew Valley.</summary>
|
/// <summary>The minimum supported version of Stardew Valley.</summary>
|
||||||
public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.3.36");
|
public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.3.36");
|
||||||
|
|
|
@ -316,7 +316,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
|
||||||
|
|
||||||
// check relative to content folder
|
// 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")
|
string contentKey = candidateKey.EndsWith(".png")
|
||||||
? candidateKey.Substring(0, candidateKey.Length - 4)
|
? candidateKey.Substring(0, candidateKey.Length - 4)
|
||||||
|
|
Loading…
Reference in New Issue