diff --git a/annotation-processor/build.gradle b/annotation-processor/build.gradle
index 089c5451..bf9fef4e 100644
--- a/annotation-processor/build.gradle
+++ b/annotation-processor/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     // Shadow annotations
     implementation 'net.fabricmc:sponge-mixin:0.15.0+'
     implementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    implementation 'net.minecraftforge:mergetool:1.2.3'
+    implementation 'net.minecraftforge:mergetool:1.1.7'
     implementation 'net.neoforged:mergetool:2.0.5'
 }
 
diff --git a/gradle.properties b/gradle.properties
index 1e040964..87d7fad5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ forge_version=21.0.111-beta
 parchment_version=2024.07.07
 refined_storage_version=4392788
 jei_version=19.5.0.47
-rei_version=16.0.744
+rei_version=14.1.742
 ctm_version=1.21-1.2.0+2
 kubejs_version=2001.6.5-build.14
 rhino_version=2100.2.5-build.44
@@ -30,4 +30,4 @@ spark_version=4587310
 use_fabric_api_at_runtime=false
 
 # Look up maven coordinates when changing shadow_version
-shadow_version=8.1.1
\ No newline at end of file
+shadow_version=8.0.0
\ No newline at end of file
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 073d7838..b3ec0559 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     modCompileOnly files("deps/ctm.jar")
 
     modCompileOnly("curse.maven:supermartijncore-454372:4455391")
-    modCompileOnly("vazkii.patchouli:Patchouli:1.20.6-86")
+    modCompileOnly("vazkii.patchouli:Patchouli:1.21-87-NEOFORGE-SNAPSHOT")
 
     // runtime remapping at home
     for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {