From 9dc48de3e118c999dfd9a3fd88345c332dcf7b33 Mon Sep 17 00:00:00 2001 From: Zoryn Aaron Date: Tue, 22 Mar 2016 16:38:16 -0400 Subject: update config to fix array merging --- StardewModdingAPI/Config.cs | 2 +- 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"; -- cgit