Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-11-30 01:26:08 -04:00
commit af153eb42d
3 files changed
+3 -3

No files matched your search

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