Merge branch 'master' into future

This commit is contained in:
gnembon committed 2022-03-24 21:54:28 +01:00
commit 2b7201612f
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
fabric_version=0.46.4+1.18 fabric_version=0.46.4+1.18
# Mod Properties # Mod Properties
mod_version = 1.4.67 mod_version = 1.4.68
maven_group = carpet maven_group = carpet
archives_base_name = fabric-carpet archives_base_name = fabric-carpet
+1 -1
View File
@@ -45,7 +45,7 @@ import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal") @SuppressWarnings("CanBeFinal")
public class CarpetSettings public class CarpetSettings
{ {
public static final String carpetVersion = "1.4.67+v220318"; public static final String carpetVersion = "1.4.68+v220324";
public static final Logger LOG = LoggerFactory.getLogger("carpet"); public static final Logger LOG = LoggerFactory.getLogger("carpet");
public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false); public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false); public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);