merge config files

1 files changed, 7 insertions, 4 deletions

diff --git a/src/StardewModdingAPI/Framework/Models/UserSettings.cs b/src/StardewModdingAPI/Framework/Models/SConfig.cs
index a0074f77..558da82a 100644
--- a/src/StardewModdingAPI/Framework/Models/UserSettings.cs
+++ b/src/StardewModdingAPI/Framework/Models/SConfig.cs
@@ -1,15 +1,18 @@
 namespace StardewModdingAPI.Framework.Models
 {
-    /// <summary>Contains user settings from SMAPI's JSON configuration file.</summary>
-    internal class UserSettings
+    /// <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; }
     }
 }