Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-12-09 10:36:40 -04:00
commit 442b802638
3 files changed
+3 -3

No files matched your search

@@ -29,7 +29,7 @@ import static carpet.settings.RuleCategory.DISPENSER;
public class CarpetSettings
{
public static final String carpetVersion = "1.2.5+v191203";
public static final String carpetVersion = "1.2.6+v191209";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;