From c1f98351aa85950de8b64af2501800f82f6fef01 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Fri, 28 Feb 2025 17:05:48 +0100
Subject: [PATCH 1/4] Build a jar

---
 build.gradle      | 2 +-
 gradle.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index a94d642594..6615c1d80d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -138,7 +138,7 @@ dependencies {
 
     jarJar("dev.engine-room.flywheel:flywheel-neoforge-${flywheel_minecraft_version}:${flywheel_version}") {
         version {
-            strictly "[1.0,2.0)"
+            strictly "[1.0.0-9,2.0)"
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index b081bb4072..09b770ce17 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ minecraft_version = 1.21.1
 minecraft_version_range=[1.21.1]
 
 neo_version = 21.1.125
-neo_version_range=[21.1.115,)
+neo_version_range=[21.1.125,)
 
 parchment_minecraft_version = 1.21.1
 parchment_version = 2024.11.17
@@ -25,7 +25,7 @@ registrate_version = MC1.21-1.3.0+62
 flywheel_minecraft_version = 1.21.1
 flywheel_version = 1.0.0-9
 vanillin_version = 1.0.0-beta-9
-flywheel_version_range = [1.0.0-alpha,2.0)
+flywheel_version_range = [1.0.0,2.0)
 ponder_version = 1.0.39
 jei_minecraft_version = 1.21.1
 jei_version = 19.21.0.247

From 447c8f0a36767ca0a761bbbe8fc3f5d478a173ec Mon Sep 17 00:00:00 2001
From: IThundxr <me@ithundxr.dev>
Date: Fri, 28 Feb 2025 11:15:01 -0500
Subject: [PATCH 2/4] Comment out cf publishing

---
 build.gradle | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 38ea4dbd00..ebb549eb43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -328,11 +328,12 @@ publishMods {
     modLoaders.add("forge")
     modLoaders.add("neoforge")
 
-    curseforge {
-        accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
-        projectId = "328085"
-        minecraftVersions.add(minecraft_version)
-    }
+    // TODO - Uncomment post update 6
+//    curseforge {
+//        accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
+//        projectId = "328085"
+//        minecraftVersions.add(minecraft_version)
+//    }
 
     modrinth {
         accessToken = providers.environmentVariable("MODRINTH_TOKEN")

From 62bbb107ac375907d1867adb63d125c262385634 Mon Sep 17 00:00:00 2001
From: IThundxr <me@ithundxr.dev>
Date: Fri, 28 Feb 2025 11:19:45 -0500
Subject: [PATCH 3/4] Update displayName

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

diff --git a/build.gradle b/build.gradle
index 77c596f473..26947c9d78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -285,7 +285,7 @@ publishMods {
     file = jar.archiveFile
     changelog = ChangelogText.getChangelogText(project).toString()
     type = STABLE
-    displayName = "$mod_name $minecraft_version $mod_version"
+    displayName = "$mod_name $mod_version for mc$minecraft_version"
     modLoaders.add("neoforge")
 
     // TODO - Uncomment post update 6

From dbb4f9decb114af64cae7a808f7ae643f3d5fccf Mon Sep 17 00:00:00 2001
From: IThundxr <me@ithundxr.dev>
Date: Fri, 28 Feb 2025 11:36:20 -0500
Subject: [PATCH 4/4] Java 4021

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 12c7b0873b..d10986741d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,9 +10,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Java
-        run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
+        run: echo "JAVA_HOME=$JAVA_HOME_21_X64" >> "$GITHUB_ENV"
 
-      - name: NeoGradle Cache
+      - name: ModDevGradle Cache
         uses: actions/cache@v4
         with:
           path: "**/.gradle/repositories/"