diff --git a/build.gradle b/build.gradle
index f2dfd32fa..c6433d2e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -184,10 +184,19 @@ subprojects { p ->
         testAnnotationProcessor("systems.manifold:manifold-strings:${rootProject.manifold_version}")
         
         // Log4j
-        // TODO: Change to shadowMe later to work in the standalone jar
-        // We cannot do this now as it would break Quilt
-        implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
-        implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
+        if (p == project(":core"))
+        {
+            // the standalone core jar needs logging shaded otherwise it won't run
+            forgeShadowMe("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
+            forgeShadowMe("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")   
+        }
+        else
+        {
+            // When running in MC, MC already includes logging
+            implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
+            implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
+        }
+        
 
         // JOML
         if (project.hasProperty("embed_joml") && embed_joml == "true")
@@ -457,6 +466,7 @@ subprojects { p ->
             attributes( 
                 'Implementation-Title': rootProject.mod_name,
                 'Implementation-Version': rootProject.mod_version,
+                'Multi-Release': true, // needed for logging in the standalone core jar
                 'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain' // When changing the main of the jar change this line
             )
         }
diff --git a/coreSubProjects b/coreSubProjects
index 01da4eb43..65336860d 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 01da4eb430fc6580238bf4ba10301563f350b4ac
+Subproject commit 65336860d2ca1e3298972a40fa10933da9101ca4