Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2020-01-11 11:53:45 -04:00
commit 892fa1e9a1
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.3+v200105";
public static final String carpetVersion = "1.3.4+v200111";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;