Merge branch 'master' into inventory

This commit is contained in:
gnembon committed 2019-06-28 23:03:51 -03:00
commit 546134969d
9 files changed
+46 -35

No files matched your search

@@ -25,7 +25,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
public class CarpetSettings
{
public static final String carpetVersion = "v19_06_24alpha";
public static final String carpetVersion = "v190627";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;