Merge branch 'master' into 1.17

# Conflicts:
#	gradle.properties
This commit is contained in:
gnembon committed 2021-01-15 11:41:07 -04:00
commit 981dcf6eaa
6 files changed
+21 -7

No files matched your search

+2 -2
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.11.0
# Mod Properties
mod_version = 1.4.22
mod_version = 1.4.23
maven_group = 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)
# 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.16.3,1.16.4
release-curse-versions = 1.16.4,1.16.5
# Whether or not to build another branch on release
release-extra-branch = true
# The name of the second branch to release