diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-06-21 11:39:37 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2020-06-21 11:39:37 -0400 |
| commit | ba0dff819f2e65b16a0c7bc7a9233fdb101994d0 (patch) | |
| tree | 93d91857b16f1894be21967feb7ce928bc7792e9 | |
| parent | e64ecc89f94641d4054162eff4943f660f43030f (diff) | |
| parent | 4f73fb5c33545b99ea95d4af6ad3660660c1dc64 (diff) | |
| download | SMAPI-ba0dff819f2e65b16a0c7bc7a9233fdb101994d0.tar.gz SMAPI-ba0dff819f2e65b16a0c7bc7a9233fdb101994d0.tar.bz2 SMAPI-ba0dff819f2e65b16a0c7bc7a9233fdb101994d0.zip | |
Merge branch 'develop' into stable
| -rw-r--r-- | build/common.targets | 2 | ||||
| -rw-r--r-- | docs/release-notes.md | 5 | ||||
| -rw-r--r-- | src/SMAPI.Mods.ConsoleCommands/manifest.json | 4 | ||||
| -rw-r--r-- | src/SMAPI.Mods.SaveBackup/manifest.json | 4 | ||||
| -rw-r--r-- | src/SMAPI/Constants.cs | 2 | ||||
| -rw-r--r-- | src/SMAPI/Framework/Events/ManagedEventHandler.cs | 2 |
6 files changed, 12 insertions, 7 deletions
diff --git a/build/common.targets b/build/common.targets index f66f51df..8137ef28 100644 --- a/build/common.targets +++ b/build/common.targets @@ -4,7 +4,7 @@ <!--set properties --> <PropertyGroup> - <Version>3.6.0</Version> + <Version>3.6.1</Version> <Product>SMAPI</Product> <LangVersion>latest</LangVersion> diff --git a/docs/release-notes.md b/docs/release-notes.md index 1c5dc1dd..1fa58807 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -7,6 +7,11 @@ * Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info). --> +## 3.6.1 +Released 21 June 2020 for Stardew Valley 1.4.1 or later. + +* Fixed event priority sorting. + ## 3.6 Released 20 June 2020 for Stardew Valley 1.4.1 or later. diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json index 05304312..7300cdf8 100644 --- a/src/SMAPI.Mods.ConsoleCommands/manifest.json +++ b/src/SMAPI.Mods.ConsoleCommands/manifest.json @@ -1,9 +1,9 @@ { "Name": "Console Commands", "Author": "SMAPI", - "Version": "3.6.0", + "Version": "3.6.1", "Description": "Adds SMAPI console commands that let you manipulate the game.", "UniqueID": "SMAPI.ConsoleCommands", "EntryDll": "ConsoleCommands.dll", - "MinimumApiVersion": "3.6.0" + "MinimumApiVersion": "3.6.1" } diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json index 5d5336e7..cffd780d 100644 --- a/src/SMAPI.Mods.SaveBackup/manifest.json +++ b/src/SMAPI.Mods.SaveBackup/manifest.json @@ -1,9 +1,9 @@ { "Name": "Save Backup", "Author": "SMAPI", - "Version": "3.6.0", + "Version": "3.6.1", "Description": "Automatically backs up all your saves once per day into its folder.", "UniqueID": "SMAPI.SaveBackup", "EntryDll": "SaveBackup.dll", - "MinimumApiVersion": "3.6.0" + "MinimumApiVersion": "3.6.1" } diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs index 66971709..a7e44de6 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("3.6.0"); + public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.6.1"); /// <summary>The minimum supported version of Stardew Valley.</summary> public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.4.1"); diff --git a/src/SMAPI/Framework/Events/ManagedEventHandler.cs b/src/SMAPI/Framework/Events/ManagedEventHandler.cs index cf470c1e..b32a2a22 100644 --- a/src/SMAPI/Framework/Events/ManagedEventHandler.cs +++ b/src/SMAPI/Framework/Events/ManagedEventHandler.cs @@ -47,7 +47,7 @@ namespace StardewModdingAPI.Framework.Events if (!(obj is ManagedEventHandler<TEventArgs> other)) throw new ArgumentException("Can't compare to an unrelated object type."); - int priorityCompare = this.Priority.CompareTo(other.Priority); + int priorityCompare = -this.Priority.CompareTo(other.Priority); // higher value = sort first return priorityCompare != 0 ? priorityCompare : this.RegistrationOrder.CompareTo(other.RegistrationOrder); |