Merge 1.18 into 1.19.2

embeddedt · embeddedt · commit 89522a81973d · 2023-07-14T13:54:50.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -104,7 +104,9 @@ configure(subprojects.findAll {it.name == "common" || it.name == "forge" || it.n
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         mappings loom.layered() {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
+            if(rootProject.hasProperty("parchment_version")) {
+                parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,9 @@ configure(subprojects.findAll {it.name == "common" \|\| it.name == "forge" \|\| it.n`
`104`	`104`	`minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"`
`105`	`105`	`mappings loom.layered() {`
`106`	`106`	`officialMojangMappings()`
`107`		`- parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")`
	`107`	`+ if(rootProject.hasProperty("parchment_version")) {`
	`108`	`+ parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")`
	`109`	`+ }`
`108`	`110`	`}`
`109`	`111`	`}`
`110`	`112`