StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47 from Zoryn4163/master 

merges release to master
This commit is contained in:
Zoryn 2016-03-22 16:41:05 -04:00
parent e04a52915f 9dc48de3e1
commit 37764f06e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
StardewModdingAPI/Config.cs
View File

@ -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());
}

2
StardewModdingAPI/Constants.cs
View File

@ -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";