diff --git a/build.gradle b/build.gradle
index 36801a2d..e8d20d56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,16 @@
+buildscript {
+    dependencies {
+        classpath 'org.semver4j:semver4j:6.0.0'
+    }
+}
+
+import org.semver4j.Semver
+
 plugins {
     id 'java-library'
     id 'maven-publish'
     id 'idea'
-    id 'net.neoforged.moddev' version '2.0.140'
+    id 'net.neoforged.moddev' version '2.0.141'
     id 'me.modmuss50.mod-publish-plugin' version '1.1.0'
 }
 
@@ -85,6 +93,10 @@ sourceSets.main.resources {
     srcDir 'src/generated/resources'
 }
 
+configurations {
+    runtimeClasspath.extendsFrom localRuntime
+}
+
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
     implementation("com.cake.azimuth:azimuth:${azimuth_version}")
@@ -114,7 +126,7 @@ dependencies {
     if (enable_cc_tweaked.toBoolean()) {
         compileOnly("cc.tweaked:cc-tweaked-$minecraft_version-core-api:$cc_tweaked_version")
         compileOnly("cc.tweaked:cc-tweaked-$minecraft_version-forge-api:$cc_tweaked_version")
-        runtimeOnly("cc.tweaked:cc-tweaked-$minecraft_version-forge:$cc_tweaked_version")
+        localRuntime("cc.tweaked:cc-tweaked-$minecraft_version-forge:$cc_tweaked_version")
     }
 }
 
@@ -176,12 +188,13 @@ String getRelevantChangelog(String targetVersion) {
             def versionTag = line.substring(2).trim()
             def entryMinecraftVersion = versionTag.split("-")[0]
             def entryModVersion = versionTag.split("-").length > 1 ? versionTag.split("-")[1] : ""
+            entryModVersion = entryModVersion.replace("jolly", "")
             if (versionTag == targetVersion) {
                 capturing = true
                 continue
             }
             if (entryMinecraftVersion == targetMinecraftVersion &&
-                    org.gradle.util.VersionNumber.parse(entryModVersion) > org.gradle.util.VersionNumber.parse(targetModVersion)) {
+                    new Semver(entryModVersion) > new Semver(targetModVersion)) {
                 newerVersionsExist = true
             }
         } else if (capturing && line.trim()) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ff23a68d..1a704683 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME