Merge branch 'develop' into stable
This commit is contained in:
commit
7dd3e37dec
|
@ -1,7 +1,7 @@
|
|||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<!--set general build properties -->
|
||||
<Version>3.10.0</Version>
|
||||
<Version>3.10.1</Version>
|
||||
<Product>SMAPI</Product>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
|
||||
|
|
|
@ -7,6 +7,12 @@
|
|||
* Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info).
|
||||
-->
|
||||
|
||||
## 3.10.1
|
||||
Released 03 May 2021 for Stardew Valley 1.5.4 or later.
|
||||
|
||||
* For players:
|
||||
* Fixed installer leaving an unneeded `StardewModdingAPI-x64.exe` file in 32-bit game folders.
|
||||
|
||||
## 3.10
|
||||
Released 03 May 2021 for Stardew Valley 1.5.4 or later. See [release highlights](https://www.patreon.com/posts/50764911).
|
||||
|
||||
|
|
|
@ -45,6 +45,7 @@ namespace StardewModdingApi.Installer
|
|||
yield return GetInstallPath("StardewModdingAPI.exe.mdb"); // Linux/macOS only
|
||||
yield return GetInstallPath("StardewModdingAPI.pdb"); // Windows only
|
||||
yield return GetInstallPath("StardewModdingAPI.xml");
|
||||
yield return GetInstallPath("StardewModdingAPI-x64.exe"); // not normally added to game folder, but may be mistakenly added by a manual install
|
||||
yield return GetInstallPath("smapi-internal");
|
||||
yield return GetInstallPath("steam_appid.txt");
|
||||
|
||||
|
@ -424,25 +425,23 @@ namespace StardewModdingApi.Installer
|
|||
this.RecursiveCopy(sourceEntry, paths.GameDir);
|
||||
}
|
||||
|
||||
if (isWindows64Bit)
|
||||
// handle 64-bit file
|
||||
{
|
||||
this.PrintDebug("Making SMAPI 64-bit...");
|
||||
FileInfo x64Executable = new FileInfo(Path.Combine(paths.BundleDir.FullName, "StardewModdingAPI-x64.exe"));
|
||||
if (x64Executable.Exists)
|
||||
FileInfo x64Executable = new FileInfo(Path.Combine(paths.GameDir.FullName, "StardewModdingAPI-x64.exe"));
|
||||
if (isWindows64Bit)
|
||||
{
|
||||
string targetName = "StardewModdingAPI.exe";
|
||||
this.InteractivelyDelete(Path.Combine(paths.GameDir.FullName, targetName));
|
||||
this.InteractivelyDelete(Path.Combine(paths.GameDir.FullName, x64Executable.Name));
|
||||
|
||||
this.RecursiveCopy(x64Executable, paths.GameDir);
|
||||
File.Move(Path.Combine(paths.GamePath, x64Executable.Name), Path.Combine(paths.GamePath, targetName));
|
||||
}
|
||||
else
|
||||
{
|
||||
this.PrintError($"Oops! Could not find the required '{x64Executable.Name}' installer file. SMAPI was unable to install correctly.");
|
||||
Console.ReadLine();
|
||||
return;
|
||||
this.PrintDebug("Making SMAPI 64-bit...");
|
||||
if (x64Executable.Exists)
|
||||
{
|
||||
string targetPath = Path.Combine(paths.GameDir.FullName, "StardewModdingAPI.exe");
|
||||
this.InteractivelyDelete(targetPath);
|
||||
x64Executable.MoveTo(targetPath);
|
||||
}
|
||||
else
|
||||
this.PrintError($"Oops! Could not find the required '{x64Executable.Name}' installer file. SMAPI may not work correctly.");
|
||||
}
|
||||
else if (x64Executable.Exists)
|
||||
x64Executable.Delete();
|
||||
}
|
||||
|
||||
// replace mod launcher (if possible)
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"Name": "Console Commands",
|
||||
"Author": "SMAPI",
|
||||
"Version": "3.10.0",
|
||||
"Version": "3.10.1",
|
||||
"Description": "Adds SMAPI console commands that let you manipulate the game.",
|
||||
"UniqueID": "SMAPI.ConsoleCommands",
|
||||
"EntryDll": "ConsoleCommands.dll",
|
||||
"MinimumApiVersion": "3.10.0"
|
||||
"MinimumApiVersion": "3.10.1"
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"Name": "Error Handler",
|
||||
"Author": "SMAPI",
|
||||
"Version": "3.10.0",
|
||||
"Version": "3.10.1",
|
||||
"Description": "Handles some common vanilla errors to log more useful info or avoid breaking the game.",
|
||||
"UniqueID": "SMAPI.ErrorHandler",
|
||||
"EntryDll": "ErrorHandler.dll",
|
||||
"MinimumApiVersion": "3.10.0"
|
||||
"MinimumApiVersion": "3.10.1"
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"Name": "Save Backup",
|
||||
"Author": "SMAPI",
|
||||
"Version": "3.10.0",
|
||||
"Version": "3.10.1",
|
||||
"Description": "Automatically backs up all your saves once per day into its folder.",
|
||||
"UniqueID": "SMAPI.SaveBackup",
|
||||
"EntryDll": "SaveBackup.dll",
|
||||
"MinimumApiVersion": "3.10.0"
|
||||
"MinimumApiVersion": "3.10.1"
|
||||
}
|
||||
|
|
|
@ -61,7 +61,7 @@ namespace StardewModdingAPI
|
|||
internal static int? LogScreenId { get; set; }
|
||||
|
||||
/// <summary>SMAPI's current raw semantic version.</summary>
|
||||
internal static string RawApiVersion = "3.10.0";
|
||||
internal static string RawApiVersion = "3.10.1";
|
||||
}
|
||||
|
||||
/// <summary>Contains SMAPI's constants and assumptions.</summary>
|
||||
|
|
Loading…
Reference in New Issue