Merge branch 'master' into release/1.20.1

Author: Negative-light

fabric/build.gradle

@@ -103,7 +103,7 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
     mainFile.addJavaVersion("Java 17")
     mainFile.addGameVersion("${project.minecraft_version}")
     mainFile.changelogType = "markdown"
-    mainFile.changelog = file("$project.buildDir/changelog.md").exists() ? file("$project.buildDir/changelog.md").text : null
+    mainFile.changelog = file("$project.buildDir/doc/changelog.md").exists() ? file("$project.buildDir/doc/changelog.md").text : 'Check github for full changelog'
 }
 
 
@@ -118,5 +118,5 @@ modrinth {
     uploadFile = remapJar
     gameVersions = ["${project.minecraft_version}"]
     loaders = ["fabric", "quilt"]
-    changelog = file("$project.buildDir/changelog.md").exists() ? file("$project.buildDir/changelog.md").text : null
+    changelog = file("$project.buildDir/doc/changelog.html").exists() ? file("$project.buildDir/doc/changelog.html").text : 'Check github for full changelog'
 }

forge/build.gradle

@@ -147,7 +147,7 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
     mainFile.addJavaVersion("Java 17")
     mainFile.addGameVersion("${project.minecraft_version}")
     mainFile.changelogType = "markdown"
-    mainFile.changelog = file("$project.buildDir/changelog.md").exists() ? file("$project.buildDir/changelog.md").text : null
+    mainFile.changelog = file("$project.buildDir/doc/changelog.md").exists() ? file("$project.buildDir/doc/changelog.md").text : 'Check github for full changelog'
 }
 
 tasks.modrinth.dependsOn(tasks.build)
@@ -160,8 +160,8 @@ modrinth {
     versionType = release_type
     uploadFile = jar
     gameVersions = ["${project.minecraft_version}"]
-    loaders = ["forge", "neoforge"]
-    changelog = file("$project.buildDir/changelog.html").exists() ? file("$project.buildDir/changelog.html").text : null
+    loaders = ["forge"]
+    changelog = file("$project.buildDir/doc/changelog.md").exists() ? file("$project.buildDir/doc/changelog.md").text : 'Check github for full changelog'
 }
 
 // Ensure build is done prior to cursegradle tasks