Merge branch 'master' into future

This commit is contained in:
gnembon committed 2021-11-11 23:22:18 +01:00
commit 669f8be992
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
fabric_version=0.42.1+1.18
# Mod Properties
mod_version = 1.4.52
mod_version = 1.4.53
maven_group = carpet
archives_base_name = fabric-carpet
+1 -1
View File
@@ -43,7 +43,7 @@ import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
{
public static final String carpetVersion = "1.4.52+v211104";
public static final String carpetVersion = "1.4.53+v211111";
public static final Logger LOG = LogManager.getLogger("carpet");
public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);