Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-10-02 14:29:40 -03:00
commit 412b33fee2
3 files changed
+3 -3

No files matched your search

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