diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-08-26 01:13:36 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2021-08-26 01:13:36 -0400 |
| commit | 4ee96a20bb6c74bc7ff6176a03e7f15d47cddfa8 (patch) | |
| tree | 73f1048faacdedc941a561cd74240a1c449fc230 /src/SMAPI | |
| parent | c95de4e109203e45d07a35a448c21ee43eb976f3 (diff) | |
| parent | c065675604a1d93f55828be6030baa3131dd7553 (diff) | |
| download | SMAPI-4ee96a20bb6c74bc7ff6176a03e7f15d47cddfa8.tar.gz SMAPI-4ee96a20bb6c74bc7ff6176a03e7f15d47cddfa8.tar.bz2 SMAPI-4ee96a20bb6c74bc7ff6176a03e7f15d47cddfa8.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/SCore.cs | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs index 8086ffa9..04e15998 100644 --- a/src/SMAPI/Constants.cs +++ b/src/SMAPI/Constants.cs @@ -62,7 +62,7 @@ namespace StardewModdingAPI internal static int? LogScreenId { get; set; } /// <summary>SMAPI's current raw semantic version.</summary> - internal static string RawApiVersion = "3.12.4"; + internal static string RawApiVersion = "3.12.5"; } /// <summary>Contains SMAPI's constants and assumptions.</summary> diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs index dff0fc55..c1aa3721 100644 --- a/src/SMAPI/Framework/SCore.cs +++ b/src/SMAPI/Framework/SCore.cs @@ -1708,16 +1708,6 @@ namespace StardewModdingAPI.Framework IManifest manifest = mod.Manifest; string assemblyPath = Path.Combine(mod.DirectoryPath, manifest.EntryDll); - // assert 64-bit -#if SMAPI_FOR_WINDOWS_64BIT_HACK - if (!EnvironmentUtility.Is64BitAssembly(assemblyPath)) - { - errorReasonPhrase = "it needs to be updated for 64-bit mode."; - failReason = ModFailReason.LoadFailed; - return false; - } -#endif - // load mod Assembly modAssembly; try @@ -1741,6 +1731,10 @@ namespace StardewModdingAPI.Framework catch (Exception ex) { errorReasonPhrase = "its DLL couldn't be loaded."; +#if SMAPI_FOR_WINDOWS_64BIT_HACK + if (!EnvironmentUtility.Is64BitAssembly(assemblyPath)) + errorReasonPhrase = "it needs to be updated for 64-bit mode."; +#endif errorDetails = $"Error: {ex.GetLogSummary()}"; failReason = ModFailReason.LoadFailed; return false; |