Merge branch 'master' into 1.15

src/main/java/carpet/settings/SettingsManager.java

@@ -189,9 +189,16 @@ public class SettingsManager
             disableBooleanFromCategory(RuleCategory.COMMAND);
         }
         for (String key: conf.getLeft().keySet())
+        {
+            try
             {
                 if (rules.get(key).set(server.getCommandSource(), conf.getLeft().get(key)) != null)
-                CarpetSettings.LOG.info("[CM]: loaded setting "+key+" as "+conf.getLeft().get(key)+" from "+identifier+".conf");
+                    CarpetSettings.LOG.info("[CM]: loaded setting " + key + " as " + conf.getLeft().get(key) + " from " + identifier + ".conf");
+            }
+            catch (Exception exc)
+            {
+                CarpetSettings.LOG.error("[CM Error]: Failed to load setting: "+key+", "+exc);
+            }
         }
         locked = conf.getRight();
     }