Merge 1.20 into 1.20.2

embeddedt · embeddedt · commit 02fa2be42be4 · 2023-09-24T12:50:16.000-04:00
diff --git a/buildSrc/src/main/groovy/modernfix.platform-conventions.gradle b/buildSrc/src/main/groovy/modernfix.platform-conventions.gradle
@@ -57,7 +57,7 @@ modrinth {
     uploadFile = remapJar
     gameVersions = supported_minecraft_versions.tokenize(",")
     loaders = [project.name]
-    changelog.set(provider { file("CHANGELOG.md").getText('UTF-8') })
+    changelog.set(provider { file("${rootDir}/CHANGELOG.md").getText('UTF-8') })
 }
 
 tasks.curseforge.dependsOn(rootProject.generateChangelog)

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ modrinth {`
`57`	`57`	`uploadFile = remapJar`
`58`	`58`	`gameVersions = supported_minecraft_versions.tokenize(",")`
`59`	`59`	`loaders = [project.name]`
`60`		`- changelog.set(provider { file("CHANGELOG.md").getText('UTF-8') })`
	`60`	`+ changelog.set(provider { file("${rootDir}/CHANGELOG.md").getText('UTF-8') })`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`tasks.curseforge.dependsOn(rootProject.generateChangelog)`