diff --git a/buildSrc/src/main/groovy/dh-loader.gradle b/buildSrc/src/main/groovy/dh-loader.gradle
index eb1afb9d7..8627d0442 100644
--- a/buildSrc/src/main/groovy/dh-loader.gradle
+++ b/buildSrc/src/main/groovy/dh-loader.gradle
@@ -334,14 +334,15 @@ if (isNotCommonProject) {
         }
 
         // Make run tasks use the shadow jar so relocated deps (NightConfig, etc.) work in dev.
-        // Without this, NeoForge's bundled NightConfig 3.8.x conflicts with DH's 3.6.6.
+        def shadowedFiles = configurations.shadowMe.resolve().collect { it.name }.toSet() // Filter out jars that are already bundled+relocated in the shadow jar to avoid classpath conflicts (e.g. DH's NightConfig vs NeoForge's).
         tasks.withType(JavaExec).configureEach { runTask ->
             dependsOn(shadowJar)
             classpath = files(shadowJar.archiveFile) + classpath.filter { file ->
                 !file.path.contains(project.buildDir.path) &&
                 !file.path.contains("core${File.separator}build") &&
                 !file.path.contains("api${File.separator}build") &&
-                !file.path.contains("common${File.separator}build")
+                !file.path.contains("common${File.separator}build") &&
+                !shadowedFiles.contains(file.name)
             }
         }
     }
diff --git a/coreSubProjects b/coreSubProjects
index d45a1379b..1ec342928 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit d45a1379bd0225d013fbb19a2084e160c3733009
+Subproject commit 1ec342928f69981f394d96edb5ebce5f6ce90117
diff --git a/gradle.properties b/gradle.properties
index a2f7d123d..343a6ad13 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,7 @@ mod_discord=https://discord.gg/xAB8G4cENx
 # Global Plugin Versions
 manifold_version=2026.1.6
 # 2023.1.17 can be used if there are mystery Java compiler issues
-nightconfig_version=3.6.6
+nightconfig_version=3.8.3
 lz4_version=1.8.0
 xz_version=1.9
 zstd_version=1.5.7-6