Merge branch 'master' into future
# Conflicts: # gradle.properties
This commit is contained in:
commit
ea9ea3f279
2 files changed
+3
-3
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user