Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2020-01-27 23:14:15 -04:00
commit 26a038041e
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -32,7 +32,7 @@ import static carpet.settings.RuleCategory.DISPENSER;
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
{
public static final String carpetVersion = "1.3.6+v200121";
public static final String carpetVersion = "1.3.7+v200127";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;