summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-01-25 18:22:50 -0500
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-01-25 18:22:50 -0500
commitfc0b98be4584eec2b06a3af09cc4b85f9e9a9efc (patch)
tree4a469ca6cbefb5724580ca8ea2cbee8823428bfa /src/SMAPI/Framework
parent7a6dab7548e7bc32a685e916edec83f6458881c1 (diff)
downloadSMAPI-fc0b98be4584eec2b06a3af09cc4b85f9e9a9efc.tar.gz
SMAPI-fc0b98be4584eec2b06a3af09cc4b85f9e9a9efc.tar.bz2
SMAPI-fc0b98be4584eec2b06a3af09cc4b85f9e9a9efc.zip
add user settings that override defaults (#693)
Diffstat (limited to 'src/SMAPI/Framework')
-rw-r--r--src/SMAPI/Framework/SCore.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index d71b5e5a..81b7c2e8 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -153,6 +153,9 @@ namespace StardewModdingAPI.Framework
// init basics
this.Settings = JsonConvert.DeserializeObject<SConfig>(File.ReadAllText(Constants.ApiConfigPath));
+ if (File.Exists(Constants.ApiUserConfigPath))
+ JsonConvert.PopulateObject(File.ReadAllText(Constants.ApiUserConfigPath), this.Settings);
+
this.LogFile = new LogFileManager(logPath);
this.Monitor = new Monitor("SMAPI", this.ConsoleManager, this.LogFile, this.Settings.ConsoleColors, this.Settings.VerboseLogging)
{