diff --git a/Common/build.gradle b/Common/build.gradle
index 843d62a..15a4dec 100644
--- a/Common/build.gradle
+++ b/Common/build.gradle
@@ -1,7 +1,7 @@
 archivesBaseName = "${mod_name.replace(" ", "")}-Common-${minecraft_version}"
 
 dependencies {
-
+    stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
 }
 
 shadowJar {
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index 8de4fb1..a3a6220 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -9,6 +9,8 @@ dependencies {
         exclude(group: "net.fabricmc.fabric-api")
     }
 
+    stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
+
     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
     modImplementation "maven.modrinth:vanish:${vanish}"
 
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
index 6e5cc53..38cc901 100644
--- a/Fabric/src/main/resources/fabric.mod.json
+++ b/Fabric/src/main/resources/fabric.mod.json
@@ -33,7 +33,7 @@
   "depends": {
     "fabricloader": ">=0.16.2",
     "fabric-api": "*",
-    "minecraft": ">=1.21.2",
+    "minecraft": "*",
     "java": ">=21"
   }
 }
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
index 8203464..ff01197 100644
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -4,6 +4,8 @@ dependencies {
     // Compat
     modImplementation("maven.modrinth:vanishmod:${vanishmod_neo}")
 
+    stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
+
     // Do not edit or remove
     implementation project(":Common")
 }
@@ -32,7 +34,12 @@ shadowJar {
 
 unimined.minecraft {
     neoForged {
-        loader neoforge_version
+        if (isPort) {
+            loader "net.neoforged:neoforge:${neoforge_version}:universal"
+        } else {
+            loader neoforge_version
+        }
+
         mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
     }
 }
diff --git a/build.gradle b/build.gradle
index 06c875d..926470e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,15 +7,21 @@ plugins {
     id 'maven-publish'
 }
 
+var relType = project.properties["releaseType"] ?: "${release_type}"
+
+ext {
+    isPort = (relType == 'port')
+}
+
 orion.setup {
     multiProject = true
     enableMirrorMaven = true
     enableReleasesMaven = true
+    enableSnapshotsMaven = isPort
 
     dopplerToken = System.getenv("DOPPLER_KEY")
 
     versioning {
-        var relType = project.properties["releaseType"] ?: "${release_type}"
         identifier("${relType}")
     }
 }
@@ -36,6 +42,7 @@ subprojects {
 
     repositories {
         mavenCentral()
+        mavenLocal()
 
         maven {
             name = "Modrinth"
@@ -66,8 +73,6 @@ subprojects {
         shade "net.kyori:adventure-text-serializer-gson:${adventure}"
         shade "net.kyori:adventure-text-minimessage:${adventure}"
 
-        stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
-
         compileOnly 'net.luckperms:api:5.4'
         compileOnly("org.projectlombok:lombok:${lombok}")
         annotationProcessor("org.projectlombok:lombok:${lombok}")
diff --git a/gradle.properties b/gradle.properties
index f853b4c..d8635a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,21 +10,21 @@ mod_id=craterlib
 mod_name=CraterLib
 
 # Shared
-minecraft_version=1.21.2-pre3
+minecraft_version=1.21.2-rc1
 project_group=com.hypherionmc.craterlib
 
 # Fabric
 fabric_loader=0.16.5
-fabric_api=0.105.4+1.21.2
+fabric_api=0.106.0+1.21.2
 
 # Forge
 forge_version=50.0.6
 
 # NeoForged
-neoforge_version=0.0-beta
+neoforge_version=21.2.0-alpha.1.21.2-rc1.20241017.224038
 
 # Dependencies
-moon_config=1.0.9
+moon_config=1.0.10
 lombok=1.18.32
 adventure=4.17.0
 rpc_sdk=1.0
diff --git a/settings.gradle b/settings.gradle
index 1fd0229..07a31e6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,4 +14,4 @@ pluginManagement {
 }
 
 rootProject.name = 'CraterLib'
-include("Common", "Fabric", /*"NeoForge"*/)
\ No newline at end of file
+include("Common", "Fabric", "NeoForge")
\ No newline at end of file