Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-10-30 13:24:03 -03:00
commit 99f6b4580d
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.0+v191024";
public static final String carpetVersion = "1.2.1+v191030";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;