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

Merge branch 'master' into future

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
gnembon committed 2022-03-31 23:11:36 +02:00
2 parents ef3e71b9b6 bee280f696
commit ea9ea3f279
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
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
fabric_version=0.49.4+1.19 fabric_version=0.49.4+1.19
# Mod Properties # Mod Properties
mod_version = 1.4.68 mod_version = 1.4.69
maven_group = carpet maven_group = carpet
archives_base_name = fabric-carpet archives_base_name = fabric-carpet
@@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx1G
# The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5) # The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5)
# This is needed because CF uses too vague names for prereleases and release candidates # This is needed because CF uses too vague names for prereleases and release candidates
# 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-curse-versions = 1.18-1.18.2 release-curse-versions = 1.18:1.18.2
# Whether or not to build another branch on release # Whether or not to build another branch on release
release-extra-branch = true release-extra-branch = true
# The name of the second branch to release # The name of the second branch to release
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.68+v220324"; public static final String carpetVersion = "1.4.69+v220331";
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);