Merge branch 'android' of https://github.com/MartyrPher/SMAPI.git into android

# Conflicts:
#	src/SMAPI/Framework/RewriteFacades/SpriteTextMethods.cs
This commit is contained in:
yangzhi 2020-02-14 13:04:25 +08:00
commit 6ff2db235a
2 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@
<HintPath>..\SMAPI\bin\Debug\StardewModdingAPI.dll</HintPath>
</Reference>
<Reference Include="StardewValley">
<HintPath>..\..\..\..\..\Downloads\StardewValleyAndroidStuff\base_1.4.4.118\assemblies\StardewValley.dll</HintPath>
<HintPath>..\..\..\..\..\Downloads\StardewValleyAndroidStuff\base_1.4.5.136\assemblies\StardewValley.dll</HintPath>
</Reference>
</ItemGroup>

View File

@ -20,7 +20,7 @@ namespace StardewModdingAPI
** Public
****/
/// <summary>SMAPI's current semantic version.</summary>
public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.2.0.2", allowNonStandard: true);
public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.2.0.3-RC1", allowNonStandard: true);
/// <summary>The minimum supported version of Stardew Valley.</summary>
public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.4.1");
@ -95,7 +95,7 @@ namespace StardewModdingAPI
internal static string ModsPath { get; set; }
/// <summary>The game's current semantic version.</summary>
internal static ISemanticVersion GameVersion { get; } = new GameVersion("1.4.4.130");
internal static ISemanticVersion GameVersion { get; } = new GameVersion("1.4.5.136");
/// <summary>The target game platform.</summary>
internal static Platform Platform { get; } = Platform.Android;