icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source
This commit is contained in:
gnembon committed 2021-07-06 16:44:50 -03:00
2 parents 59c8c208b3 233e56d2cd
commit c9b8511e1b
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+2 -2
View File
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
fabric_version=0.36.1+1.17 fabric_version=0.36.1+1.17
# Mod Properties # Mod Properties
mod_version = 1.4.42 mod_version = 1.4.43
maven_group = carpet maven_group = carpet
archives_base_name = fabric-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 # The "name" or id of the Curseforge version for the secondary branch
# This is needed because CF uses too vague names for snapshots # 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] # 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
src/main/java/carpet/CarpetSettings.java
+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.42+v210702"; public static final String carpetVersion = "1.4.43+v210706";
public static final Logger LOG = LogManager.getLogger("carpet"); public static final Logger LOG = LogManager.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);