diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-04-22 22:06:02 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-04-22 22:06:02 -0400 |
| commit | e22a54212182d0adc443ac95bc791e83c90f7e10 (patch) | |
| tree | 14e240470817445a5098d6577a46832f6f7511ec /src/SMAPI | |
| parent | 013255d89e1a802e05f9fd61a16701ca73fa4411 (diff) | |
| parent | 98f58c353e3488ddb87979d406fbfcbe3d3ddb8f (diff) | |
| download | SMAPI-e22a54212182d0adc443ac95bc791e83c90f7e10.tar.gz SMAPI-e22a54212182d0adc443ac95bc791e83c90f7e10.tar.bz2 SMAPI-e22a54212182d0adc443ac95bc791e83c90f7e10.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI')
| -rw-r--r-- | src/SMAPI/Constants.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Framework/ModHelpers/ContentHelper.cs | 2 |
2 files changed, 2 insertions, 2 deletions
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 ****/ /// <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> 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) |