From e060ec6e5c29dd3fe8d4a9dd30c180cea9d7cecd Mon Sep 17 00:00:00 2001
From: samolego <34912839+samolego@users.noreply.github.com>
Date: Sun, 28 Nov 2021 20:47:28 +0100
Subject: [PATCH] Minor tweaks

---
 fabric/build.gradle | 6 +++---
 forge/build.gradle  | 4 ++--
 gradle.properties   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index f5bf538..749d3d8 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -93,9 +93,9 @@ curseforge {
 
     project {
         id = "550916"
-        changelog = "A changelog can be found at https://github.com/samolego/TraderNPCs/releases/tag/${version}"
+        changelog = ENV.CHANGELOG ?: "A changelog can be found at https://github.com/samolego/TraderNPCs/releases/tag/${version}"
         releaseType = "release"
-        addGameVersion "${project.minecraft_version}"
+        addGameVersion "1.18-Snapshot"
         addGameVersion "Fabric"
 
         mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}-fabric.jar")) {
@@ -120,7 +120,7 @@ task modrinth(type: TaskModrinthUpload, dependsOn: remapJar) {
     token = ENV.MODRINTH_TOKEN
     projectId = "78ZQG4Et"
     versionNumber = project.minecraft_version + "+" + version + "-fabric"
-    changelog = "A changelog can be found at https://github.com/samolego/TraderNPCs/releases/tag/${version}"
+    changelog = ENV.CHANGELOG ?: "A changelog can be found at https://github.com/samolego/TraderNPCs/releases/tag/${version}"
     versionName = "[${project.minecraft_version}] TraderNPCs ${version} [Fabric]"
     releaseType = "release"
 
diff --git a/forge/build.gradle b/forge/build.gradle
index de0c104..f2a0be0 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -97,7 +97,7 @@ curseforge {
 
     project {
         id = "550916"
-        changelog = "A changelog can be found at https://github.com/samolego/TraderNPCs/releases/tag/${version}"
+        changelog = ENV.CHANGELOG ?: "A changelog can be found at https://github.com/samolego/TraderNPCs/releases/tag/${version}"
         releaseType = "release"
         addGameVersion "${project.minecraft_version}"
         addGameVersion "Forge"
@@ -124,7 +124,7 @@ task modrinth(type: TaskModrinthUpload, dependsOn: remapJar) {
     token = ENV.MODRINTH_TOKEN
     projectId = "78ZQG4Et"
     versionNumber = project.minecraft_version + "+" + version + "-forge"
-    changelog = "A changelog can be found at https://github.com/samolego/TraderNPCs/releases/tag/${version}"
+    changelog = ENV.CHANGELOG ?: "A changelog can be found at https://github.com/samolego/TraderNPCs/releases/tag/${version}"
     versionName = "[${project.minecraft_version}] TraderNPCs ${version} [Forge]"
     releaseType = "release"
 
diff --git a/gradle.properties b/gradle.properties
index 36f31cf..57eb567 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx2048M
 
 # Fabric
-minecraft_version=1.18-pre5
-yarn_mappings=1.18-pre5+build.4
+minecraft_version=1.18-rc3
+yarn_mappings=1.18-rc3+build.2
 loader_version=0.12.5
 
 #Fabric api
-fabric_version=0.42.8+1.18
+fabric_version=0.43.1+1.18
 
 #Forge
 forge_version=37.0.71