Merge branch 'master' into 1.15

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.6.3+build.167
 
 # Mod Properties
-	mod_version = 1.2.0+v191020
+	mod_version = 1.2.0+v191024
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 

src/main/java/carpet/settings/CarpetSettings.java

@@ -28,7 +28,7 @@ import static carpet.settings.RuleCategory.TNT;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.2.0+v191020";
+    public static final String carpetVersion = "1.2.0+v191024";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;