Skip to content

Commit

Permalink
Merge branch 'master' into future
Browse files Browse the repository at this point in the history
  • Loading branch information
gnembon committed Mar 17, 2022
2 parents 193cf37 + 814147d commit 0773a7d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ org.gradle.jvmargs=-Xmx1G
fabric_version=0.46.4+1.18

# Mod Properties
mod_version = 1.4.66
mod_version = 1.4.67
maven_group = carpet
archives_base_name = fabric-carpet

# Release Action properties for Curseforge and Snapshots
# 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
# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
release-curse-versions = 1.18-Snapshot
release-curse-versions = 1.18.2
# Whether or not to build another branch on release
release-extra-branch = false
release-extra-branch = true
# The name of the second branch to release
release-extra-branch-name = future
# 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.19
release-extra-curse-version = 1.19-Snapshot
2 changes: 1 addition & 1 deletion src/main/java/carpet/CarpetSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
{
public static final String carpetVersion = "1.4.66+v220228";
public static final String carpetVersion = "1.4.67+v220318";
public static final Logger LOG = LoggerFactory.getLogger("carpet");
public static ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
public static ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);
Expand Down

0 comments on commit 0773a7d

Please sign in to comment.