diff --git a/build.gradle b/build.gradle
index 2f9653378..af6676516 100644
--- a/build.gradle
+++ b/build.gradle
@@ -152,10 +152,16 @@ subprojects { p ->
             shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
             compileClasspath.extendsFrom common
             runtimeClasspath.extendsFrom common
-            developmentForge.extendsFrom common
+            if (findProject(":forge"))
+                developmentForge.extendsFrom common
+            if (findProject(":neoforged"))
+                developmentNeoForge.extendsFrom common
             compileClasspath.extendsFrom coreProjects
             runtimeClasspath.extendsFrom coreProjects
-            developmentForge.extendsFrom coreProjects
+            if (findProject(":forge"))
+                developmentForge.extendsFrom coreProjects
+            if (findProject(":neoforged"))
+                developmentNeoForge.extendsFrom coreProjects
 
             if (findProject(":fabricLike") && p != project(":fabricLike")) {
                 // Shadow fabricLike
@@ -163,7 +169,6 @@ subprojects { p ->
                 shadowFabricLike
                 compileClasspath.extendsFrom fabricLike
                 runtimeClasspath.extendsFrom fabricLike
-                developmentForge.extendsFrom fabricLike
             }
         }
     }
diff --git a/coreSubProjects b/coreSubProjects
index 19aedc14c..43366e1f6 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 19aedc14cda316128669f196c197a71331c05a4a
+Subproject commit 43366e1f6e07f2c13019489162f295d7625f9a13
diff --git a/gradle.properties b/gradle.properties
index fbd09c11b..ac5579831 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues
 mod_discord=https://discord.gg/xAB8G4cENx
 
 # Global Plugin Versions
-manifold_version=2023.1.31
+manifold_version=2024.1.0
 nightconfig_version=3.6.6
 lz4_version=1.8.0
 sqlite_jdbc_version=3.43.0.0
@@ -44,7 +44,7 @@ versionStr=
 
 # This defines what MC version Intellij will use for the preprocessor
 # and what version is used automatically by build and run commands
-mcVer=1.20.2
+mcVer=1.20.4
 
 # Defines the maximum amount of memory Minecraft is allowed when run in a developement environment
 #minecraftMemoryJavaArg="-Xmx4G"
diff --git a/neoforged/build.gradle b/neoforged/build.gradle
index eb49e83bb..665966cd9 100644
--- a/neoforged/build.gradle
+++ b/neoforged/build.gradle
@@ -8,7 +8,7 @@ sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
 
 architectury {
     platformSetupLoomIde()
-    forge()
+    neoForge()
 }
 
 repositories {
@@ -41,8 +41,6 @@ loom {
 //        ]
     }
     mixin {
-        useLegacyMixinAp = true
-        
         // Mixins are now defined in the `mods.toml`
 //        mixinConfigs = [
 //                "DistantHorizons.mixins.json"
diff --git a/versionProperties/1.20.4.properties b/versionProperties/1.20.4.properties
index 479aaa056..637f5c1dc 100644
--- a/versionProperties/1.20.4.properties
+++ b/versionProperties/1.20.4.properties
@@ -37,8 +37,8 @@ fabric_api_version=0.91.2+1.20.4
     enable_canvas=0
 
 # (Neo)Forge loader
-forge_version=49.0.3
-neoforged_version=20.4.49-beta
+forge_version=49.0.16
+neoforged_version=20.4.83-beta
     # (Neo)Forge mod versions
     starlight_version_forge=
     terraforged_version=