Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-11-14 23:21:45 -04:00
commit 57d1546fb3
3 files changed
+4 -9

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.3+v191113";
public static final String carpetVersion = "1.2.3+v191114";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;