diff --git a/.github/workflows/rc-lite-nightly.yml b/.github/workflows/rc-lite-nightly.yml
index 3eec707dc..770a349c2 100644
--- a/.github/workflows/rc-lite-nightly.yml
+++ b/.github/workflows/rc-lite-nightly.yml
@@ -34,6 +34,11 @@ jobs:
 
     - name: Prepare Builds
       run: |
+          mkdir Lite-Modrinth-1.21.1-temp
+          cp -r ./versions/vanilla/src/re-console-lite/modrinth/fabric/1.21.1/* ./Lite-Modrinth-1.21.1-temp/
+          cp ./LICENSE ./Lite-Modrinth-1.21.1-temp/
+          cp ./README.md ./Lite-Modrinth-1.21.1-temp/
+
           mkdir Lite-Modrinth-1.21.4-temp
           cp -r ./versions/vanilla/src/re-console-lite/modrinth/fabric/1.21.4/* ./Lite-Modrinth-1.21.4-temp/
           cp ./LICENSE ./Lite-Modrinth-1.21.4-temp/
@@ -44,6 +49,12 @@ jobs:
           cp ./LICENSE ./Lite-Modrinth-1.21.5-temp/
           cp ./README.md ./Lite-Modrinth-1.21.5-temp/
 
+    - name: Create 1.21.1 build
+      run: |
+          cd ./Lite-Modrinth-1.21.1-temp/
+          packwiz refresh
+          packwiz modrinth export --output ${PACK_NAME}-1.21.1-dev-${{ env.COMMIT_SHORT_SHA }}.mrpack
+
     - name: Create 1.21.4 build
       run: |
           cd ./Lite-Modrinth-1.21.4-temp/
@@ -60,6 +71,7 @@ jobs:
       run: |
           mkdir $OUTPUT
           
+          mv ./Lite-Modrinth-1.21.1-temp/${PACK_NAME}-1.21.1-dev-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
           mv ./Lite-Modrinth-1.21.4-temp/${PACK_NAME}-1.21.4-dev-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
           mv ./Lite-Modrinth-1.21.5-temp/${PACK_NAME}-1.21.5-dev-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
 
diff --git a/.github/workflows/rc-nightly.yml b/.github/workflows/rc-nightly.yml
index d093c2a1c..af6866b0f 100644
--- a/.github/workflows/rc-nightly.yml
+++ b/.github/workflows/rc-nightly.yml
@@ -32,109 +32,161 @@ jobs:
           shortSha=$(git rev-parse --short ${{ github.sha }})
           echo "COMMIT_SHORT_SHA=$shortSha" >> $GITHUB_ENV
 
-    - name: Prepare Builds
+    - name: Prepare Fabric Builds
       run: |
-          mkdir RC-Modrinth-1.20.1-temp
-          cp -r ./versions/vanilla/src/re-console/modrinth/fabric/1.20.1/* ./RC-Modrinth-1.20.1-temp/
-          cp ./LICENSE ./RC-Modrinth-1.20.1-temp/
-          cp ./README.md ./RC-Modrinth-1.20.1-temp/
+          mkdir RC-Modrinth-Fabric-1.20.1-temp
+          cp -r ./versions/vanilla/src/re-console/modrinth/fabric/1.20.1/* ./RC-Modrinth-Fabric-1.20.1-temp/
+          cp ./LICENSE ./RC-Modrinth-Fabric-1.20.1-temp/
+          cp ./README.md ./RC-Modrinth-Fabric-1.20.1-temp/
 
-          mkdir RC-Modrinth-1.21.1-temp
-          cp -r ./versions/vanilla/src/re-console/modrinth/fabric/1.21.1/* ./RC-Modrinth-1.21.1-temp/
-          cp ./LICENSE ./RC-Modrinth-1.21.1-temp/
-          cp ./README.md ./RC-Modrinth-1.21.1-temp/
+          mkdir RC-Modrinth-Fabric-1.21.1-temp
+          cp -r ./versions/vanilla/src/re-console/modrinth/fabric/1.21.1/* ./RC-Modrinth-Fabric-1.21.1-temp/
+          cp ./LICENSE ./RC-Modrinth-Fabric-1.21.1-temp/
+          cp ./README.md ./RC-Modrinth-Fabric-1.21.1-temp/
 
-          mkdir RC-Modrinth-1.21.4-temp
-          cp -r ./versions/vanilla/src/re-console/modrinth/fabric/1.21.4/* ./RC-Modrinth-1.21.4-temp/
-          cp ./LICENSE ./RC-Modrinth-1.21.4-temp/
-          cp ./README.md ./RC-Modrinth-1.21.4-temp/
+          mkdir RC-Modrinth-Fabric-1.21.4-temp
+          cp -r ./versions/vanilla/src/re-console/modrinth/fabric/1.21.4/* ./RC-Modrinth-Fabric-1.21.4-temp/
+          cp ./LICENSE ./RC-Modrinth-Fabric-1.21.4-temp/
+          cp ./README.md ./RC-Modrinth-Fabric-1.21.4-temp/
 
-          mkdir RC-Modrinth-1.21.5-temp
-          cp -r ./versions/vanilla/src/re-console/modrinth/fabric/1.21.5/* ./RC-Modrinth-1.21.5-temp/
-          cp ./LICENSE ./RC-Modrinth-1.21.5-temp/
-          cp ./README.md ./RC-Modrinth-1.21.5-temp/
+          mkdir RC-Modrinth-Fabric-1.21.5-temp
+          cp -r ./versions/vanilla/src/re-console/modrinth/fabric/1.21.5/* ./RC-Modrinth-Fabric-1.21.5-temp/
+          cp ./LICENSE ./RC-Modrinth-Fabric-1.21.5-temp/
+          cp ./README.md ./RC-Modrinth-Fabric-1.21.5-temp/
 
-          mkdir RC-CurseForge-1.20.1-temp
-          cp -r ./versions/vanilla/src/re-console/curseforge/fabric/1.20.1/* ./RC-CurseForge-1.20.1-temp/
-          cp ./LICENSE ./RC-CurseForge-1.20.1-temp/
-          cp ./README.md ./RC-CurseForge-1.20.1-temp/
+          mkdir RC-CurseForge-Fabric-1.20.1-temp
+          cp -r ./versions/vanilla/src/re-console/curseforge/fabric/1.20.1/* ./RC-CurseForge-Fabric-1.20.1-temp/
+          cp ./LICENSE ./RC-CurseForge-Fabric-1.20.1-temp/
+          cp ./README.md ./RC-CurseForge-Fabric-1.20.1-temp/
 
-          mkdir RC-CurseForge-1.21.1-temp
-          cp -r ./versions/vanilla/src/re-console/curseforge/fabric/1.21.1/* ./RC-CurseForge-1.21.1-temp/
-          cp ./LICENSE ./RC-CurseForge-1.21.1-temp/
-          cp ./README.md ./RC-CurseForge-1.21.1-temp/
+          mkdir RC-CurseForge-Fabric-1.21.1-temp
+          cp -r ./versions/vanilla/src/re-console/curseforge/fabric/1.21.1/* ./RC-CurseForge-Fabric-1.21.1-temp/
+          cp ./LICENSE ./RC-CurseForge-Fabric-1.21.1-temp/
+          cp ./README.md ./RC-CurseForge-Fabric-1.21.1-temp/
 
-          mkdir RC-CurseForge-1.21.4-temp
-          cp -r ./versions/vanilla/src/re-console/curseforge/fabric/1.21.4/* ./RC-CurseForge-1.21.4-temp/
-          cp ./LICENSE ./RC-CurseForge-1.21.4-temp/
-          cp ./README.md ./RC-CurseForge-1.21.4-temp/
+          mkdir RC-CurseForge-Fabric-1.21.4-temp
+          cp -r ./versions/vanilla/src/re-console/curseforge/fabric/1.21.4/* ./RC-CurseForge-Fabric-1.21.4-temp/
+          cp ./LICENSE ./RC-CurseForge-Fabric-1.21.4-temp/
+          cp ./README.md ./RC-CurseForge-Fabric-1.21.4-temp/
 
-          mkdir RC-CurseForge-1.21.5-temp
-          cp -r ./versions/vanilla/src/re-console/curseforge/fabric/1.21.5/* ./RC-CurseForge-1.21.5-temp/
-          cp ./LICENSE ./RC-CurseForge-1.21.5-temp/
-          cp ./README.md ./RC-CurseForge-1.21.5-temp/
+          mkdir RC-CurseForge-Fabric-1.21.5-temp
+          cp -r ./versions/vanilla/src/re-console/curseforge/fabric/1.21.5/* ./RC-CurseForge-Fabric-1.21.5-temp/
+          cp ./LICENSE ./RC-CurseForge-Fabric-1.21.5-temp/
+          cp ./README.md ./RC-CurseForge-Fabric-1.21.5-temp/
 
-    - name: Create 1.20.1 build Modrinth
+    - name: Prepare NeoForge Builds
       run: |
-          cd ./RC-Modrinth-1.20.1-temp/
+          mkdir RC-Modrinth-NeoForge-1.21.1-temp
+          cp -r ./versions/vanilla/src/re-console/modrinth/neoforged/1.21.1/* ./RC-Modrinth-NeoForge-1.21.1-temp/
+          cp ./LICENSE ./RC-Modrinth-NeoForge-1.21.1-temp/
+          cp ./README.md ./RC-Modrinth-NeoForge-1.21.1-temp/
+
+          mkdir RC-Modrinth-NeoForge-1.21.5-temp
+          cp -r ./versions/vanilla/src/re-console/modrinth/neoforged/1.21.5/* ./RC-Modrinth-NeoForge-1.21.5-temp/
+          cp ./LICENSE ./RC-Modrinth-NeoForge-1.21.5-temp/
+          cp ./README.md ./RC-Modrinth-NeoForge-1.21.5-temp/
+
+          mkdir RC-CurseForge-NeoForge-1.21.1-temp
+          cp -r ./versions/vanilla/src/re-console/curseforge/neoforged/1.21.1/* ./RC-CurseForge-NeoForge-1.21.1-temp/
+          cp ./LICENSE ./RC-CurseForge-NeoForge-1.21.1-temp/
+          cp ./README.md ./RC-CurseForge-NeoForge-1.21.1-temp/
+
+          mkdir RC-CurseForge-NeoForge-1.21.5-temp
+          cp -r ./versions/vanilla/src/re-console/curseforge/neoforged/1.21.5/* ./RC-CurseForge-NeoForge-1.21.5-temp/
+          cp ./LICENSE ./RC-CurseForge-NeoForge-1.21.5-temp/
+          cp ./README.md ./RC-CurseForge-NeoForge-1.21.5-temp/
+
+    - name: Create 1.20.1 Fabric build Modrinth
+      run: |
+          cd ./RC-Modrinth-Fabric-1.20.1-temp/
           packwiz refresh
-          packwiz modrinth export --output ${PACK_NAME}-1.20.1-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
+          packwiz modrinth export --output ${PACK_NAME}-1.20.1-Fabric-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
 
-    - name: Create 1.21.1 build Modrinth
+    - name: Create 1.21.1 Fabric build Modrinth
       run: |
-          cd ./RC-Modrinth-1.21.1-temp/
+          cd ./RC-Modrinth-Fabric-1.21.1-temp/
           packwiz refresh
-          packwiz modrinth export --output ${PACK_NAME}-1.21.1-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
+          packwiz modrinth export --output ${PACK_NAME}-1.21.1-Fabric-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
 
-    - name: Create 1.21.4 build Modrinth
+    - name: Create 1.21.4 Fabric build Modrinth
       run: |
-          cd ./RC-Modrinth-1.21.4-temp/
+          cd ./RC-Modrinth-Fabric-1.21.4-temp/
           packwiz refresh
-          packwiz modrinth export --output ${PACK_NAME}-1.21.4-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
+          packwiz modrinth export --output ${PACK_NAME}-1.21.4-Fabric-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
 
-    - name: Create 1.21.5 build Modrinth
+    - name: Create 1.21.5 Fabric build Modrinth
       run: |
-          cd ./RC-Modrinth-1.21.5-temp/
+          cd ./RC-Modrinth-Fabric-1.21.5-temp/
           packwiz refresh
-          packwiz modrinth export --output ${PACK_NAME}-1.21.5-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
+          packwiz modrinth export --output ${PACK_NAME}-1.21.5-Fabric-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
 
-    - name: Create 1.20.1 build CurseForge
+    - name: Create 1.20.1 Fabric build CurseForge
       run: |
-          cd ./RC-CurseForge-1.20.1-temp/
+          cd ./RC-CurseForge-Fabric-1.20.1-temp/
           packwiz refresh
-          packwiz curseforge export --output ${PACK_NAME}-1.20.1-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
+          packwiz curseforge export --output ${PACK_NAME}-1.20.1-Fabric-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
 
-    - name: Create 1.21.1 build CurseForge
+    - name: Create 1.21.1 Fabric build CurseForge
       run: |
-          cd ./RC-CurseForge-1.21.1-temp/
+          cd ./RC-CurseForge-Fabric-1.21.1-temp/
           packwiz refresh
-          packwiz curseforge export --output ${PACK_NAME}-1.21.1-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
+          packwiz curseforge export --output ${PACK_NAME}-1.21.1-Fabric-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
 
-    - name: Create 1.21.4 build CurseForge
+    - name: Create 1.21.4 Fabric build CurseForge
       run: |
-          cd ./RC-CurseForge-1.21.4-temp/
+          cd ./RC-CurseForge-Fabric-1.21.4-temp/
           packwiz refresh
-          packwiz curseforge export --output ${PACK_NAME}-1.21.4-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
+          packwiz curseforge export --output ${PACK_NAME}-1.21.4-Fabric-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
 
-    - name: Create 1.21.5 build CurseForge
+    - name: Create 1.21.5 Fabric build CurseForge
       run: |
-          cd ./RC-CurseForge-1.21.5-temp/
+          cd ./RC-CurseForge-Fabric-1.21.5-temp/
           packwiz refresh
-          packwiz curseforge export --output ${PACK_NAME}-1.21.5-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
+          packwiz curseforge export --output ${PACK_NAME}-1.21.5-Fabric-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
+
+    - name: Create 1.21.1 NeoForge build Modrinth
+      run: |
+          cd ./RC-Modrinth-NeoForge-1.21.1-temp/
+          packwiz refresh
+          packwiz modrinth export --output ${PACK_NAME}-1.21.1-NeoForge-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
+
+    - name: Create 1.21.5 NeoForge build Modrinth
+      run: |
+          cd ./RC-Modrinth-NeoForge-1.21.5-temp/
+          packwiz refresh
+          packwiz modrinth export --output ${PACK_NAME}-1.21.5-NeoForge-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack
+
+    - name: Create 1.21.1 NeoForge build CurseForge
+      run: |
+          cd ./RC-CurseForge-NeoForge-1.21.1-temp/
+          packwiz refresh
+          packwiz curseforge export --output ${PACK_NAME}-1.21.1-NeoForge-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
+
+    - name: Create 1.21.5 NeoForge build CurseForge
+      run: |
+          cd ./RC-CurseForge-NeoForge-1.21.5-temp/
+          packwiz refresh
+          packwiz curseforge export --output ${PACK_NAME}-1.21.5-NeoForge-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip
 
     - name: Prepare artifacts
       run: |
           mkdir $OUTPUT
 
-          mv ./RC-Modrinth-1.20.1-temp/${PACK_NAME}-1.20.1-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
-          mv ./RC-Modrinth-1.21.1-temp/${PACK_NAME}-1.21.1-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
-          mv ./RC-Modrinth-1.21.4-temp/${PACK_NAME}-1.21.4-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
-          mv ./RC-Modrinth-1.21.5-temp/${PACK_NAME}-1.21.5-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
+          mv ./RC-Modrinth-Fabric-1.20.1-temp/${PACK_NAME}-1.20.1-Fabric-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
+          mv ./RC-Modrinth-Fabric-1.21.1-temp/${PACK_NAME}-1.21.1-Fabric-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
+          mv ./RC-Modrinth-Fabric-1.21.4-temp/${PACK_NAME}-1.21.4-Fabric-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
+          mv ./RC-Modrinth-Fabric-1.21.5-temp/${PACK_NAME}-1.21.5-Fabric-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
 
-          mv ./RC-CurseForge-1.20.1-temp/${PACK_NAME}-1.20.1-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
-          mv ./RC-CurseForge-1.21.1-temp/${PACK_NAME}-1.21.1-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
-          mv ./RC-CurseForge-1.21.4-temp/${PACK_NAME}-1.21.4-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
-          mv ./RC-CurseForge-1.21.5-temp/${PACK_NAME}-1.21.5-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
+          mv ./RC-CurseForge-Fabric-1.20.1-temp/${PACK_NAME}-1.20.1-Fabric-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
+          mv ./RC-CurseForge-Fabric-1.21.1-temp/${PACK_NAME}-1.21.1-Fabric-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
+          mv ./RC-CurseForge-Fabric-1.21.4-temp/${PACK_NAME}-1.21.4-Fabric-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
+          mv ./RC-CurseForge-Fabric-1.21.5-temp/${PACK_NAME}-1.21.5-Fabric-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
+
+          mv ./RC-Modrinth-NeoForge-1.21.1-temp/${PACK_NAME}-1.21.1-NeoForge-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
+          mv ./RC-Modrinth-NeoForge-1.21.5-temp/${PACK_NAME}-1.21.5-NeoForge-dev-Modrinth-${{ env.COMMIT_SHORT_SHA }}.mrpack ${OUTPUT}/
+
+          mv ./RC-CurseForge-NeoForge-1.21.1-temp/${PACK_NAME}-1.21.1-NeoForge-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
+          mv ./RC-CurseForge-NeoForge-1.21.5-temp/${PACK_NAME}-1.21.5-NeoForge-dev-CurseForge-${{ env.COMMIT_SHORT_SHA }}.zip ${OUTPUT}/
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4