diff options
| author | Zoryn <Zoryn4163@users.noreply.github.com> | 2016-03-22 16:41:05 -0400 |
|---|---|---|
| committer | Zoryn <Zoryn4163@users.noreply.github.com> | 2016-03-22 16:41:05 -0400 |
| commit | 37764f06e2896bd548295f3eabd2fd01eff40617 (patch) | |
| tree | e0450cfa862c080c1ad409d868c76b105af45ee4 /StardewModdingAPI | |
| parent | e04a52915f71b2f07f4e4e8899420b6c178d8574 (diff) | |
| parent | 9dc48de3e118c999dfd9a3fd88345c332dcf7b33 (diff) | |
| download | SMAPI-37764f06e2896bd548295f3eabd2fd01eff40617.tar.gz SMAPI-37764f06e2896bd548295f3eabd2fd01eff40617.tar.bz2 SMAPI-37764f06e2896bd548295f3eabd2fd01eff40617.zip | |
Merge pull request #47 from Zoryn4163/master
merges release to master
Diffstat (limited to 'StardewModdingAPI')
| -rw-r--r-- | StardewModdingAPI/Config.cs | 2 | ||||
| -rw-r--r-- | StardewModdingAPI/Constants.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/StardewModdingAPI/Config.cs b/StardewModdingAPI/Config.cs index 67c13a14..84119179 100644 --- a/StardewModdingAPI/Config.cs +++ b/StardewModdingAPI/Config.cs @@ -89,7 +89,7 @@ namespace StardewModdingAPI //user config with their values var u = baseConfig.JObject; - b.Merge(u); + b.Merge(u, new JsonMergeSettings { MergeArrayHandling = MergeArrayHandling.Replace }); return (Config)b.ToObject(baseConfig.GetType()); } diff --git a/StardewModdingAPI/Constants.cs b/StardewModdingAPI/Constants.cs index fa117ece..d3e53c05 100644 --- a/StardewModdingAPI/Constants.cs +++ b/StardewModdingAPI/Constants.cs @@ -35,7 +35,7 @@ namespace StardewModdingAPI public const int MinorVersion = 38; - public const int PatchVersion = 4; + public const int PatchVersion = 5; public const string Build = "Alpha"; |