diff --git a/build.gradle b/build.gradle
index 3a735e8a..a65b1f76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 	id "com.matthewprenger.cursegradle" version "1.+"
@@ -158,6 +158,7 @@ curseforge {
 		mainArtifact(remapJar)
 		
 		addGameVersion project.minecraft_version
+		addGameVersion '1.21'
 		addGameVersion 'Quilt'
 		addGameVersion 'Fabric'
 		addGameVersion 'Java 21'
@@ -190,7 +191,7 @@ modrinth {
     versionType = "${version_type}"
 	changelog = rootProject.file("docs/CHANGELOG.md").text
     uploadFile = remapJar
-    gameVersions = [ project.minecraft_version ]
+    gameVersions = [ project.minecraft_version, '1.21' ]
 	loaders = ['fabric', 'quilt']
 	
 	dependencies {
diff --git a/forge/build.gradle b/forge/build.gradle
index 554643f6..1e6b2c1c 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -195,6 +195,7 @@ curseforge {
         changelog = rootProject.file('docs/CHANGELOG.md')
 		
 		addGameVersion project.minecraft_version
+		addGameVersion '1.21'
 		addGameVersion "Java 21"
 		addGameVersion "Forge"
 		
@@ -211,7 +212,7 @@ modrinth {
     versionType = "${version_type}"
 	changelog = rootProject.file("docs/CHANGELOG.md").text
     uploadFile = jar
-    gameVersions = [ project.minecraft_version ]
+    gameVersions = [ project.minecraft_version, '1.21' ]
 	
 	syncBodyFrom = rootProject.file("docs/README.md").text
 }
diff --git a/gradle.properties b/gradle.properties
index 1da81078..87531a78 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
 # Toolchain Properties
-minecraft_version=1.21
-yarn_mappings=1.21+build.2
-fabric_loader_version=0.15.11
-forge_version=1.21-51.0.8
-neoforge_version=21.0.16-beta
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.3
+fabric_loader_version=0.16.7
+forge_version=1.21.1-52.0.24
+neoforge_version=21.1.73
 
 # Mod Properties
-mod_version=1.21-v2.8.0
+mod_version=1.21.1-v2.9.0
 maven_group=com.aizistral.nochatreports
 archives_base_name=NoChatReports-FABRIC
 mod_id=nochatreports
@@ -23,7 +23,7 @@ mod_icon=assets/nochatreports/textures/misc/ncr_logo.png
 mod_license=WTFPL
 
 # Dependencies
-fabric_version=0.100.3+1.21
+fabric_version=0.107.0+1.21.1
 mod_menu_version=11.0.0-rc.4
 cloth_config_version=15.0.127
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4413138..df97d72b 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.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index c19ff6bb..63dc6818 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -22,7 +22,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id "com.modrinth.minotaur" version "2.+"
-    id 'net.neoforged.gradle.userdev' version '7.0.142'
+    id 'net.neoforged.gradle.userdev' version '7.0.145'
 }
 
 println("Applying plugins...")
@@ -170,6 +170,7 @@ curseforge {
         changelog = rootProject.file('docs/CHANGELOG.md')
 		
 		addGameVersion project.minecraft_version
+		addGameVersion '1.21'
 		addGameVersion "Java 21"
 		addGameVersion "NeoForge"
 		
@@ -186,7 +187,7 @@ modrinth {
     versionType = "${version_type}"
 	changelog = rootProject.file("docs/CHANGELOG.md").text
     uploadFile = jar
-    gameVersions = [ project.minecraft_version ]
+    gameVersions = [ project.minecraft_version, '1.21' ]
 	
 	syncBodyFrom = rootProject.file("docs/README.md").text
 }