Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2020-12-16 18:04:52 -04:00
commit c2436f1f09
8 files changed
+88 -24

No files matched your search

+1 -1
View File
@@ -36,7 +36,7 @@ import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
{
public static final String carpetVersion = "1.4.20+v201202";
public static final String carpetVersion = "1.4.21+v201216";
public static final Logger LOG = LogManager.getLogger("carpet");
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;