Merge branch '1.19.2' into 1.19.3

* 1.19.2:
  rollback

# Conflicts:
#	gradle.properties

forge/build.gradle

@@ -31,7 +31,7 @@ configurations {
 }
 
 dependencies {
-	forge "net.minecraftforge:forge:${rootProject.forge_mc_version}-${rootProject.forge_version}"
+	forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
 
 	common(project(path: ":common", configuration: "namedElements")) { transitive false }
 	shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
@@ -55,7 +55,6 @@ processResources {
 	inputs.property "modDescription", rootProject.mod_description
 	inputs.property "modAuthor", rootProject.mod_author
 	inputs.property "minecraftVersion", rootProject.minecraft_version
-	inputs.property "forgeMcVersion", rootProject.forge_mc_version
 	inputs.property "forgeVersion", rootProject.forge_version
 
 	filesMatching("META-INF/mods.toml") {
@@ -65,7 +64,6 @@ processResources {
 			"modDescription": rootProject.mod_description,
 			"modAuthor": rootProject.mod_author,
 			"minecraftVersion": rootProject.minecraft_version,
-			"forgeMcVersion": rootProject.forge_mc_version,
 			"forgeVersion": rootProject.forge_version
 	}
 }

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

@@ -20,7 +20,7 @@ versionRange = "[${forgeVersion},)"
 [[dependencies.${ modId }]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[${forgeMcVersion},)"
+versionRange = "[${minecraftVersion},)"
 
 [modproperties.${ modId }]
 catalogueImageIcon = "catalogue_icon.png"

gradle.properties

@@ -34,5 +34,4 @@ fabric_loader_version=0.15.1
 fabric_api_version=0.76.1+1.19.3
 
 # Forge https://files.minecraftforge.net/net/minecraftforge/forge
-forge_mc_version=1.19.3
 forge_version=44.1.23