diff --git a/build.gradle b/build.gradle
index 36bbfb71f..362a3e2d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,7 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
-//    id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false // TODO: Move to this as it adds alot of stuff that are useful
+    id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
 }
 
 /**
@@ -97,6 +96,7 @@ def loadProperties() {
             "1.17.1": "1_17",
             "1.18.1": "1_18",
             "1.18.2": "1_18",
+            "1.19": "1_19"
     ]
     // Use this as sometimes multiple versions use the same access wideners
     rootProject.ext.set("acsessWidenerVersion", mcVersionToAcsessWidenerVersion.get(mcVersion))
@@ -135,7 +135,10 @@ subprojects { p ->
             // Mojmap mappings
             officialMojangMappings()
             // Parchment mappings (it adds parameter mappings & javadoc)
-            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
+            if (rootProject.minecraft_version != "1.19")
+                parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
+            else // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping
+                parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip")
         }
 
 		// Manifold
@@ -172,10 +175,11 @@ subprojects { p ->
             modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
         }
 
-        if (p != project(":core")) {
+
+        if (p != project(":core"))
             common(project(":core")) { transitive false }
+        if (p == project(":common"))
             shadowMe(project(":core")) { transitive false }
-        }
     }
 
     if (p == project(":fabric") || p == project(":forge")) {
@@ -372,3 +376,10 @@ allprojects { p ->
         runServer.enabled = false
     }
 }
+
+
+// this deletes the merged folder so we don't carry over
+// the previous merges to each new build job in the CI/CD pipeline
+task deleteMerged(type: Delete) {
+   delete files("./Merged")
+}
diff --git a/fabric/build.gradle b/fabric/build.gradle
index c7ff739aa..af4d094ec 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -92,6 +92,9 @@ dependencies {
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+
+    // Ran's scuffed 1.19 stuff
+    shadowMe files(project(":core").file("build/libs/DistantHorizons-${rootProject.mod_version}.jar"))
 }
 
 task deleteResources(type: Delete) {
@@ -104,6 +107,10 @@ processResources {
     dependsOn(copyCommonResources)
 }
 
+// Ran's scuffed 1.19 stuff
+jar.dependsOn(project(":core").remapJar)
+remapSourcesJar.dependsOn(project(":core").remapJar)
+
 runClient {
     dependsOn(copyAccessWidener)
     dependsOn(copyCoreResources)
diff --git a/forge/build.gradle b/forge/build.gradle
index 9bac265d3..0f8e84844 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -48,8 +48,9 @@ dependencies {
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
-
-//    forgeDependencies(project(":core")) { transitive false }
+    
+    // Ran's scuffed 1.19 stuff
+    shadowMe files(project(":core").file("build/libs/DistantHorizons-${rootProject.mod_version}.jar"))
 }
 
 processResources {
@@ -58,6 +59,10 @@ processResources {
     dependsOn(copyCommonResources)
 }
 
+// Ran's scuffed 1.19 stuff
+jar.dependsOn(project(":core").remapJar)
+remapSourcesJar.dependsOn(project(":core").remapJar)
+
 shadowJar {
     // Remove the fabric stuff from forge
     dependencies {