From 6a18dd6fadaea7d72ce9ef4e2752c669c4f6420b Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 23 Feb 2017 22:58:23 -0500
Subject: merge config files

---
 src/StardewModdingAPI/Framework/Models/SConfig.cs      | 18 ++++++++++++++++++
 src/StardewModdingAPI/Framework/Models/UserSettings.cs | 15 ---------------
 2 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 src/StardewModdingAPI/Framework/Models/SConfig.cs
 delete mode 100644 src/StardewModdingAPI/Framework/Models/UserSettings.cs

(limited to 'src/StardewModdingAPI/Framework/Models')

diff --git a/src/StardewModdingAPI/Framework/Models/SConfig.cs b/src/StardewModdingAPI/Framework/Models/SConfig.cs
new file mode 100644
index 00000000..558da82a
--- /dev/null
+++ b/src/StardewModdingAPI/Framework/Models/SConfig.cs
@@ -0,0 +1,18 @@
+namespace StardewModdingAPI.Framework.Models
+{
+    /// <summary>The SMAPI configuration settings.</summary>
+    internal class SConfig
+    {
+        /********
+        ** Accessors
+        ********/
+        /// <summary>Whether to enable development features.</summary>
+        public bool DeveloperMode { get; set; }
+
+        /// <summary>Whether to check if a newer version of SMAPI is available on startup.</summary>
+        public bool CheckForUpdates { get; set; } = true;
+
+        /// <summary>A list of mod versions which should be considered incompatible.</summary>
+        public IncompatibleMod[] IncompatibleMods { get; set; }
+    }
+}
diff --git a/src/StardewModdingAPI/Framework/Models/UserSettings.cs b/src/StardewModdingAPI/Framework/Models/UserSettings.cs
deleted file mode 100644
index a0074f77..00000000
--- a/src/StardewModdingAPI/Framework/Models/UserSettings.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace StardewModdingAPI.Framework.Models
-{
-    /// <summary>Contains user settings from SMAPI's JSON configuration file.</summary>
-    internal class UserSettings
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Whether to enable development features.</summary>
-        public bool DeveloperMode { get; set; }
-
-        /// <summary>Whether to check if a newer version of SMAPI is available on startup.</summary>
-        public bool CheckForUpdates { get; set; } = true;
-    }
-}
-- 
cgit