Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-11-08 04:07:28 -04:00
commit 4cc0412fe2
4 files changed
+41 -41

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.2+v191107";
public static final String carpetVersion = "1.2.2+v191108";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;