Merge branch 'master' into inventory

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

@@ -25,7 +25,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "v19_06_04alpha";
+    public static final String carpetVersion = "v19_06_24alpha";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;