Merge branch 'master' into future

# Conflicts:
#	gradle.properties
This commit is contained in:
gnembon committed 2022-03-31 23:11:36 +02:00
commit ea9ea3f279
2 files changed
+3 -3

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.68+v220324";
public static final String carpetVersion = "1.4.69+v220331";
public static final Logger LOG = LoggerFactory.getLogger("carpet");
public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);