Merge branch 'master' into 1.15

# Conflicts:
#	gradle.properties

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.6.4+build.169
 
 # Mod Properties
-	mod_version = 1.2.2+v191108
+	mod_version = 1.2.3+v191113
 	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.2+v191108";
+    public static final String carpetVersion = "1.2.3+v191113";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;

src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "carpet",
-  "version": "1.2.2",
+  "version": "1.2.3",
 
   "name": "Carpet Mod in Fabric",
   "description": "Carpet made out of fabric",