diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-08-23 17:53:33 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-08-23 17:53:33 -0400 |
| commit | 8df1ab7e1102dedf744e799af2cede560893c92a (patch) | |
| tree | da4d29ef930d381e7bfcf94309be76f3c99f1bda /src | |
| parent | 8ba54a682fd7de3756b6ddd262b232cf40d23ea0 (diff) | |
| parent | 7d5f95a6db3b432870097e3f1e0699f6202a41c2 (diff) | |
| download | SMAPI-8df1ab7e1102dedf744e799af2cede560893c92a.tar.gz SMAPI-8df1ab7e1102dedf744e799af2cede560893c92a.tar.bz2 SMAPI-8df1ab7e1102dedf744e799af2cede560893c92a.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src')
| -rw-r--r-- | src/GlobalAssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | src/StardewModdingAPI/Constants.cs | 4 | ||||
| -rw-r--r-- | src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs index d496fbd1..4b15d3aa 100644 --- a/src/GlobalAssemblyInfo.cs +++ b/src/GlobalAssemblyInfo.cs @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.InteropServices; [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.15.2.0")] -[assembly: AssemblyFileVersion("1.15.2.0")] +[assembly: AssemblyVersion("1.15.3.0")] +[assembly: AssemblyFileVersion("1.15.3.0")] diff --git a/src/StardewModdingAPI/Constants.cs b/src/StardewModdingAPI/Constants.cs index 7a790f1a..8ed4f416 100644 --- a/src/StardewModdingAPI/Constants.cs +++ b/src/StardewModdingAPI/Constants.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -36,7 +36,7 @@ namespace StardewModdingAPI /// <summary>SMAPI's current semantic version.</summary> public static ISemanticVersion ApiVersion { get; } = #if SMAPI_1_x - new SemanticVersion(1, 15, 2); + new SemanticVersion(1, 15, 3); #else new SemanticVersion(2, 0, 0, $"alpha-{DateTime.UtcNow:yyyyMMddHHmm}"); #endif diff --git a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs b/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs index b14ae56f..e6ec21a6 100644 --- a/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs +++ b/src/StardewModdingAPI/Framework/ModLoading/AssemblyLoader.cs @@ -76,7 +76,7 @@ namespace StardewModdingAPI.Framework.ModLoading : $"Could not load '{assemblyPath}'." ); } - if (assemblies[0].Status == AssemblyLoadStatus.AlreadyLoaded) + if (assemblies.Last().Status == AssemblyLoadStatus.AlreadyLoaded) // mod assembly is last in dependency order throw new SAssemblyLoadFailedException($"Could not load '{assemblyPath}' because it was already loaded. Do you have two copies of this mod?"); // rewrite & load assemblies in leaf-to-root order |