From 95b0d950aa3660116f4bee913680e0a696228e56 Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Mon, 28 Jun 2021 23:07:36 +0100
Subject: [PATCH 1/3] Couple of gradle fixes

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 867106ebf..6f078150d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -472,7 +472,7 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
         project.hasProperty('modrinthApiKey')
     }
 
-    token = project.hasProperty('curseForgeApiKey')
+    token = project.getProperty('modrinthApiKey')
     projectId = 'gu7yAYhd'
     versionNumber = project.mod_version
     uploadFile = jar
@@ -546,7 +546,7 @@ githubRelease {
     tagName "v${mc_version}-${mod_version}"
     releaseName "[${mc_version}] ${mod_version}"
     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()
             .takeWhile { it != 'Type "help changelog" to see the full version history.' }
             .join("\n").trim()

From 31d0b7afcd3553b43ec9a9ea9813823b007e80c8 Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Mon, 28 Jun 2021 23:20:54 +0100
Subject: [PATCH 2/3] Some further fixes to previous commit

Did NOT mean to push that
---
 build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6f078150d..587dde93b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -472,11 +472,12 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
         project.hasProperty('modrinthApiKey')
     }
 
-    token = project.getProperty('modrinthApiKey')
+    token = project.getProperty('modrinthApiKey', "")
     projectId = 'gu7yAYhd'
-    versionNumber = project.mod_version
+    versionNumber = "${project.mc_version}-${project.mod_version}"
     uploadFile = jar
     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')
 }
 

From 51dde077febfcdc2b55eaca5e1f0e76cbf1cc05c Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Tue, 29 Jun 2021 09:08:45 +0000
Subject: [PATCH 3/3] And there was me thinking I understood Gradle

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 587dde93b..1e46e3617 100644
--- a/build.gradle
+++ b/build.gradle
@@ -472,7 +472,7 @@ tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
         project.hasProperty('modrinthApiKey')
     }
 
-    token = project.getProperty('modrinthApiKey', "")
+    token = project.hasProperty('modrinthApiKey') ? project.getProperty('modrinthApiKey') : ''
     projectId = 'gu7yAYhd'
     versionNumber = "${project.mc_version}-${project.mod_version}"
     uploadFile = jar