1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 20:20:30 +00:00

Merge branch 'mc-1.15.x' into mc-1.16.x

This commit is contained in:
Jonathan Coates 2021-07-02 21:03:39 +01:00
commit 815e534dc6
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06

View File

@ -474,11 +474,12 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
project.hasProperty('modrinthApiKey') project.hasProperty('modrinthApiKey')
} }
token = project.hasProperty('curseForgeApiKey') token = project.hasProperty('modrinthApiKey') ? project.getProperty('modrinthApiKey') : ''
projectId = 'gu7yAYhd' projectId = 'gu7yAYhd'
versionNumber = project.mod_version versionNumber = "${project.mc_version}-${project.mod_version}"
uploadFile = jar uploadFile = jar
addGameVersion(project.mc_version) addGameVersion(project.mc_version)
changelog = "Release notes can be found on the [GitHub repository](https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
addLoader('forge') addLoader('forge')
} }
@ -548,7 +549,7 @@ githubRelease {
tagName "v${mc_version}-${mod_version}" tagName "v${mc_version}-${mod_version}"
releaseName "[${mc_version}] ${mod_version}" releaseName "[${mc_version}] ${mod_version}"
body.set(project.provider({ body.set(project.provider({
"## " + new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt") "## " + new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.md")
.readLines() .readLines()
.takeWhile { it != 'Type "help changelog" to see the full version history.' } .takeWhile { it != 'Type "help changelog" to see the full version history.' }
.join("\n").trim() .join("\n").trim()