Merge pull request #40 from FTBTeam/dev

Dev

Author: MichaelHillcox

build.gradle

@@ -26,8 +26,7 @@ allprojects {
 	apply plugin: "maven-publish"
 	apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/git-md-changelog.gradle"
 
-	def ENV = System.getenv()
-	version = "${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}"
+	version = project.mod_version
 	group = project.maven_group
 	archivesBaseName = project.archives_base_name
 

fabric/build.gradle

@@ -43,7 +43,7 @@ processResources {
 				"archversion": project.architectury_version,
 				"fabricapiversion": project.fabric_api_version,
 				"mcversion": project.minecraft_version,
-				"ftblibraryversion": project.ftb_library_version.replaceAll("-SNAPSHOT", "")
+				"ftblibraryversion": project.ftb_library_version
 	}
 }
 

fabric/src/main/resources/fabric.mod.json

@@ -19,7 +19,7 @@
 	},
 	"depends": {
 		"fabric": ">=${fabricapiversion}",
-		"minecraft": "~${mcversion}",
+		"minecraft": "~1.20",
 		"architectury": ">=${archversion}",
 		"ftblibrary": ">=${ftblibraryversion}"
 	}

forge/build.gradle

@@ -39,7 +39,7 @@ processResources {
 				"forgeversion": project.forge_version,
 				"forgeshortversion": project.forge_version.split("\\.")[0],
 				"mcversion": project.minecraft_version,
-				"libraryversion": project.ftb_library_version.replaceAll("-SNAPSHOT", "")
+				"ftblibraryversion": project.ftb_library_version
 	}
 }
 

forge/src/main/resources/META-INF/mods.toml

@@ -36,6 +36,6 @@ side = "BOTH"
 [[dependencies.ftbteams]]
 modId = "ftblibrary"
 mandatory = true
-versionRange = "[${libraryversion},)"
+versionRange = "[${ftblibraryversion},)"
 ordering = "AFTER"
 side = "BOTH"

gradle.properties

@@ -3,13 +3,13 @@ org.gradle.daemon=false
 mod_id=ftbteams
 archives_base_name=ftb-teams
 maven_group=dev.ftb.mods
-mod_version=2001.1.1
+mod_version=2001.1.2
 mod_author=FTB Team
 minecraft_version=1.20.1
 architectury_version=9.0.8
 fabric_loader_version=0.14.21
 fabric_api_version=0.83.1+1.20.1
-ftb_library_version=2001.1.1-build.219-SNAPSHOT
+ftb_library_version=2001.1.2
 forge_version=47.0.1
 curseforge_id_forge=404468
 curseforge_id_fabric=438497