Merge branch 'master' into 1.15

src/main/java/carpet/CarpetSettings.java

@@ -31,7 +31,7 @@ import static carpet.settings.RuleCategory.DISPENSER;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.3.0+v191210";
+    public static final String carpetVersion = "1.3.1+v191210";
     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.3.0",
+  "version": "1.3.1",
 
   "name": "Carpet Mod in Fabric",
   "description": "Carpet made out of fabric",