Skip to content

Commit

Permalink
Merge branch '1.19.2' into 1.19.3
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
#	src/main/resources/fabric.mod.json
  • Loading branch information
Siphalor committed Jul 31, 2023
2 parents 6b46d52 + c520baa commit 0979544
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .giup
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"merge-paths": [
"1.18",
"1.18->1.19"
"1.18->1.19.2->1.19.3->1.20"
],
"commands": [
{
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static def getProjectChangelog() {
if (project.hasProperty("githubToken")) {
githubRelease {
token project.githubToken
targetCommitish = project.minecraft_major_version
targetCommitish = project.git_branch
releaseName = "Version $project.mod_version for $project.mod_mc_version_spec"
body = getProjectChangelog()
releaseAssets remapJar.getArchiveFile()
Expand Down
9 changes: 6 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@ org.gradle.jvmargs = -Xmx1G
# check these on https://modmuss50.me/fabric.html
minecraft_major_version = 1.19
minecraft_version = 1.19.3
mod_mc_version_spec = 1.19.x
mod_mc_version_spec = 1.19.3/4
yarn_mappings = 2
loader_version = 0.14.12

# Mod Properties
mod_version = 1.3.2
mod_version = 1.3.3
release_type = release
maven_group = de.siphalor
archives_base_name = capsaicin

# Build Properties
git_branch = 1.19.3

# Dependencies
lombok_version = 1.18.28

# Mod dependencies
appleskin_version = mc1.19.3-2.4.2
fabric_api_version = 0.70.0+1.19.3
fabric_api_version = 0.76.0+1.19.3
polymer_version = 0.3.13+1.19.3
16 changes: 9 additions & 7 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@
"capsaicin.mixins.json"
],
"depends": {
"fabricloader": ">=0.14.12",
"fabric": "*",
"minecraft": [
">1.18",
"<1.19.3"
]
"fabricloader": ">=0.14.12"
},
"breaks": {
"polymer": "<0.3.13"
"minecraft": [
"<1.19.3",
">1.19.4"
],
"polymer": [
"<0.3.13",
">=0.4"
]
},
"custom": {
"modmenu:api": true,
Expand Down

0 comments on commit 0979544

Please sign in to comment.