diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0209906..46094cd3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
       with:
-        gradle-version: 8.14.3
+        gradle-version: 9.3.1
     - name: Build TASmod with Gradle
       run: gradle build
     - name: Upload Test Report
diff --git a/.github/workflows/buildandupload.yml b/.github/workflows/buildandupload.yml
index 41f82be4..1f188f32 100644
--- a/.github/workflows/buildandupload.yml
+++ b/.github/workflows/buildandupload.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
       with:
-        gradle-version: 8.14.3
+        gradle-version: 9.3.1
     - name: Build TASmod with Gradle
       run: gradle build
     - name: Upload artifact
diff --git a/.github/workflows/check_formatting.yml b/.github/workflows/check_formatting.yml
index 34d1c2b7..1c85923d 100644
--- a/.github/workflows/check_formatting.yml
+++ b/.github/workflows/check_formatting.yml
@@ -19,6 +19,6 @@ jobs:
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
       with:
-        gradle-version: 8.14.3
+        gradle-version: 9.3.1
     - name: Spotless Check
       run: gradle spotlessCheck
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1a142c7c..d4b82da6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 8.14.3
+          gradle-version: 9.3.1
       - name: Setup workspace
         run: gradle build -Prelease=true
       - name: Upload assets
diff --git a/README.md b/README.md
index 6c36ec35..4077b073 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ When ingame, hitting <kbd>F6</kbd> will show you options for customising your HU
 Author of the original prototype: [tr7zw](https://github.com/tr7zw/MC-TASmod)  
 Main Mod Author: Scribble  
 
-Contributions by: famous1622, Pancake  
+Contributions by: cittyinthecloud, forester302, Pancake
   
 Initial Tickratechanger: [Guichaguri](https://github.com/Guichaguri/TickrateChanger)  
 Tickrate 0 idea: [Cubitect](https://github.com/Cubitect/Cubitick)  
diff --git a/build.gradle b/build.gradle
index 2ad1cb6c..3e4015a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ plugins {
     id "fabric-loom" version "${loom_version}"
     // legacy looming (loom plugin improvements)
     id "legacy-looming" version "${loom_version}"
-    id "com.palantir.git-version" version "3.1.0"
-    id "com.diffplug.spotless" version "7.0.3"
+    id "com.palantir.git-version" version "4.2.0"
+    id "com.diffplug.spotless" version "8.1.0"
 }
 
 
@@ -16,6 +16,10 @@ if(project.release=="false") {
 version = project.version+hash
 group = project.group
 
+base {
+	archivesName = project.artifact
+}
+
 java {
 	// compile for java 8
 	sourceCompatibility = targetCompatibility = 8
@@ -56,7 +60,7 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	
 	// testing dependencies
-    testImplementation "org.junit.jupiter:junit-jupiter:5.13.3"
+    testImplementation "org.junit.jupiter:junit-jupiter:5.14.1"
     testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
@@ -77,7 +81,6 @@ processResources {
 
 // configure jar file
 jar {
-	archivesBaseName = project.artifact
 
 	// pack embedded stuff
 	from {
diff --git a/gradle.properties b/gradle.properties
index 9129b224..2a656019 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G
 
 # Fabric properties
 minecraft_version=1.12.2
-loader_version=0.17.2
-loom_version=1.11-SNAPSHOT
+loader_version=0.18.4
+loom_version=1.14-SNAPSHOT
 
 # Mod properties
 mod_name=Tool-Assisted Speedrun Mod
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1b33c55b..61285a65 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4081da4..37f78a6a 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 23d15a93..adff685a 100644
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
index 5eed7ee8..e509b2dd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index dec8d114..2a4bea59 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -5,7 +5,7 @@
 	"name": "${name}",
 	"description": "${mod_description}",
 	"authors": ["Scribble", "Pancake"],
-	"contributors": ["tr7zw", "cittyinthecloud"],
+	"contributors": ["tr7zw", "cittyinthecloud", "forester302"],
 	"contact": {
 		"homepage": "${mod_url}",
 		"sources": "${mod_sources}",