Merge branch 'master' into 1.17
This commit is contained in:
commit
c9b8511e1b
2 files changed
+3
-3
No files matched your search
+2
-2
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
|
||||
fabric_version=0.36.1+1.17
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 1.4.42
|
||||
mod_version = 1.4.43
|
||||
maven_group = carpet
|
||||
archives_base_name = fabric-carpet
|
||||
|
||||
@@ -26,4 +26,4 @@ org.gradle.jvmargs=-Xmx1G
|
||||
# The "name" or id of the Curseforge version for the secondary branch
|
||||
# This is needed because CF uses too vague names for snapshots
|
||||
# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
|
||||
release-extra-curse-version = 1.17
|
||||
release-extra-curse-version = 1.17.1
|
||||
@@ -45,7 +45,7 @@ import static carpet.settings.RuleCategory.CLIENT;
|
||||
@SuppressWarnings("CanBeFinal")
|
||||
public class CarpetSettings
|
||||
{
|
||||
public static final String carpetVersion = "1.4.42+v210702";
|
||||
public static final String carpetVersion = "1.4.43+v210706";
|
||||
public static final Logger LOG = LogManager.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