Merge branch '1.18.2/dev' into 1.19.2/dev

# Conflicts: # forge/build.gradle # gradle.properties
Cannoneers-of-Create · Sep 26, 2024 · 06332db · 06332db
2 parents ccf44d2 + ac16107
commit 06332db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,8 @@ architectury {
 }
 
 boolean ci = System.getenv("CI") != null ? System.getenv("CI").toBoolean() : false
-boolean nightly = ci && (System.getenv("RELEASE") != null ? !System.getenv("RELEASE").toBoolean() : true)
+boolean release = System.getenv("RELEASE") != null ? System.getenv("RELEASE").toBoolean() : false
+boolean nightly = ci && !release
 
 subprojects {
     apply plugin: "dev.architectury.loom"
@@ -62,7 +63,7 @@ subprojects {
     }
 
 	String buildNumber = System.getenv("GITHUB_RUN_NUMBER")
-	version = "${mod_version}+mc.${minecraft_version}-${project.name}${nightly ? "-build.${buildNumber}" : ""}"
+	version = "${mod_version}${release ? "" : "-dev"}+mc.${minecraft_version}-${project.name}${nightly ? "-build.${buildNumber}" : ""}"
 
     publishing {
         publications {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -107,7 +107,7 @@ processResources {
         "version", version,
         "forge_version", forge_version.split("\\.")[0], // only specify major version of forge
         "minecraft_version", minecraft_version,
-        "create_version", create_forge_version,
+        "create_version", create_forge_version.takeBefore("-"),
 		"unify_version", unify_forge_version,
 		"copycats_requirement", copycats_requirement_forge,
 		"framedblocks_requirement", framedblocks_requirement_forge,

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.caching=true
 # Mod Info
 archives_base_name=createbigcannons
 group=com.rbasamoyai
-mod_version=5.6.0-dev
+mod_version=5.6.0
 minecraft_version=1.19.2
 enabled_platforms=fabric,forge