Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2021-07-02 00:39:23 -03:00
commit b39dd6ea49
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -45,7 +45,7 @@ import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
{
public static final String carpetVersion = "1.4.41+v210629";
public static final String carpetVersion = "1.4.42+v210702";
public static final Logger LOG = LogManager.getLogger("carpet");
public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);