diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index 727d4b6..e7b9112 100644
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -8,6 +8,7 @@ jobs:
     strategy:
       matrix:
         version:
+          - { dir: 1_21, mc: 1.21.4, lex: 54.0.17, neo: 70-beta, java: 21 }
           - { dir: 1_21, mc: 1.21.3, lex: 53.0.7, neo: 11-beta, java: 21 }
           - { dir: 1_21, mc: 1.21.1, lex: 52.0.2, neo: 4, java: 21 }
           #- { dir: 1_21, mc: 1.21, lex: 51.0.24, neo: 96-beta, java: 21 }
diff --git a/.github/workflows/run-matrix.yml b/.github/workflows/run-matrix.yml
index 7cc629d..e1a9c6a 100644
--- a/.github/workflows/run-matrix.yml
+++ b/.github/workflows/run-matrix.yml
@@ -2,14 +2,15 @@ name: Run with gradle
 on:
   workflow_dispatch:
   workflow_call:
-  push:
-  pull_request:
 
 jobs:
   run:
     strategy:
       matrix:
         version:
+          - { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, task: neoforgeRunWithHeadlessMc }
+          - { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, task: forgeRunWithHeadlessMc }
+          - { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, task: fabricRunWithHeadlessMc }
           - { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, task: neoforgeRunWithHeadlessMc }
           - { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, task: forgeRunWithHeadlessMc }
           - { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, task: fabricRunWithHeadlessMc }
diff --git a/.github/workflows/run-mc-runtime-test.yml b/.github/workflows/run-mc-runtime-test.yml
index 55a37d3..ad0c337 100644
--- a/.github/workflows/run-mc-runtime-test.yml
+++ b/.github/workflows/run-mc-runtime-test.yml
@@ -2,29 +2,34 @@ name: Run all versions with mc-runtime-test
 on:
   workflow_dispatch:
   workflow_call:
+  push:
+  pull_request:
 
 jobs:
   run:
     strategy:
       matrix:
         version:
-          - { dir: 1_21, mc: 1.21.3, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
-          - { dir: 1_21, mc: 1.21.3, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
-          - { dir: 1_21, mc: 1.21.3, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
-          - { dir: 1_21, mc: 1.21.1, type: lexforge, modloader: forge, regex: .*forge.*, java: 21 }
-          - { dir: 1_21, mc: 1.21.1, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
-          - { dir: 1_21, mc: 1.21.1, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
-          #- { dir: 1_21, mc: 1.21, type: lexforge, modloader: lexforge, regex: .*forge.*, java: 21 }
-          #- { dir: 1_21, mc: 1.21, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
-          #- { dir: 1_21, mc: 1.21, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
-          - { dir: 1_20, mc: 1.20.6, type: lexforge, modloader: lexforge, regex: .*forge.*, java: 21 }
-          - { dir: 1_20, mc: 1.20.6, type: neoforge, modloader: neoforge, regex: .*neoforge.*, java: 21 }
-          - { dir: 1_20, mc: 1.20.6, type: fabric, modloader: fabric, regex: .*fabric.*, java: 21 }
-          - { dir: 1_19, mc: 1.19.4, type: lexforge, modloader: lexforge, regex: .*forge.*, java: 17 }
-          - { dir: 1_19, mc: 1.19.4, type: fabric, modloader: fabric, regex: .*fabric.*, java: 17 }
-          - { dir: 1_16, mc: 1.16.5, type: lexforge, modloader: lexforge, regex: .*forge.*, java: 8 }
-          - { dir: 1_16, mc: 1.16.5, type: fabric, modloader: fabric, regex: .*fabric.*, java: 8 }
-          - { dir: 1_12, mc: 1.12.2, type: lexforge, modloader: lexforge, regex: .*forge.*, java: 8 }
+          - { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
+          - { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, type: lexforge, modloader: forge, regex: .*forge.* }
+          - { dir: 1_21, mc: 1.21.4, java: 21, lex: 54.0.17, neo: 70-beta, type: fabric, modloader: fabric, regex: .*fabric.* }
+          - { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
+          - { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, type: lexforge, modloader: forge, regex: .*forge.* }
+          - { dir: 1_21, mc: 1.21.3, java: 21, lex: 53.0.7, neo: 11-beta, type: fabric, modloader: fabric, regex: .*fabric.* }
+          - { dir: 1_21, mc: 1.21.1, java: 21, lex: 52.0.2, neo: 4, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
+          - { dir: 1_21, mc: 1.21.1, java: 21, lex: 52.0.2, neo: 4, type: lexforge, modloader: forge, regex: .*forge.* }
+          - { dir: 1_21, mc: 1.21.1, java: 21, lex: 52.0.2, neo: 4, type: fabric, modloader: fabric, regex: .*fabric.* }
+          #- { dir: 1_21, mc: 1.21, java: 21, lex: 51.0.24, neo: 96-beta, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
+          #- { dir: 1_21, mc: 1.21, java: 21, lex: 51.0.24, neo: 96-beta, type: lexforge, modloader: forge, regex: .*forge.* }
+          #- { dir: 1_21, mc: 1.21, java: 21, lex: 51.0.24, neo: 96-beta, fabric, modloader: fabric, regex: .*fabric.* }
+          - { dir: 1_20, mc: 1.20.6, java: 21, lex: 50.1.10, neo: 119, type: neoforge, modloader: neoforge, regex: .*neoforge.* }
+          - { dir: 1_20, mc: 1.20.6, java: 21, lex: 50.1.10, neo: 119, type: lexforge, modloader: forge, regex: .*forge.* }
+          - { dir: 1_20, mc: 1.20.6, java: 21, lex: 50.1.10, neo: 119, type: fabric, modloader: fabric, regex: .*fabric.* }
+          - { dir: 1_19, mc: 1.19.4, java: 17, lex: 45.2.9, neo: 0, type: lexforge, modloader: forge, regex: .*forge.* }
+          - { dir: 1_19, mc: 1.19.4, java: 17, lex: 45.2.9, neo: 0, type: fabric, modloader: fabric, regex: .*fabric.* }
+          - { dir: 1_16, mc: 1.16.5, java: 8, lex: 36.2.42, neo: 0, type: lexforge, modloader: forge, regex: .*forge.* }
+          - { dir: 1_16, mc: 1.16.5, java: 8, lex: 36.2.42, neo: 0, type: fabric, modloader: fabric, regex: .*fabric.* }
+          - { dir: 1_12, mc: 1.12.2, java: 8, lex: 14.23.5.2860, neo: 0, type: lexforge, modloader: forge, regex: .*forge.* }
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
@@ -42,21 +47,21 @@ jobs:
         run: chmod +x gradlew
       - name: Build with Gradle
         working-directory: ./${{ matrix.version.dir }}
-        run: ./gradlew build --stacktrace
+        run: ./gradlew build -Pminecraft_version=${{ matrix.version.mc }} -Plexforge_version=${{ matrix.version.lex }} -Pneoforge_version=${{ matrix.version.neo }} --stacktrace
       - name: Create mods dir
         run: mkdir -p run/mods
       - name: List mod files
         run: ls ${{ matrix.version.dir }}/build/libs
       - name: Delete dev jar
         run: rm ${{ matrix.version.dir }}/build/libs/*-dev.jar
-      - name: Delete remapped jar
-        run: rm ${{ matrix.version.dir }}/build/libs/*-remapped.jar
+      #- name: Delete remapped jar
+      #  run: rm ${{ matrix.version.dir }}/build/libs/*-remapped.jar
       - name: Copy mod jar
         run: cp ${{ matrix.version.dir }}/build/libs/hmc-optimizations-*${{ matrix.version.type }}*.jar run/mods
       - name: List mod dir
         run: ls run/mods
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.0
+        uses: 3arthqu4ke/mc-runtime-test@3.0.0
         with:
           mc: ${{ matrix.version.mc }}
           modloader: ${{ matrix.version.modloader }}
diff --git a/1_12/build.gradle b/1_12/build.gradle
index 8d249f4..faf6456 100644
--- a/1_12/build.gradle
+++ b/1_12/build.gradle
@@ -23,7 +23,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'xyz.wagyourtail.unimined' version '1.3.10-SNAPSHOT'
+    id 'xyz.wagyourtail.unimined' version '1.3.10'
     id 'com.gradleup.shadow' version '8.3.0'
     id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
 }
@@ -259,11 +259,3 @@ for (Modlauncher mLauncher : Modlauncher.values()) {
         }
     }
 }
-
-remapFabricSourcesJar {
-    enabled = false
-}
-
-remapLexforgeSourcesJar {
-    enabled = false
-}
diff --git a/1_16/build.gradle b/1_16/build.gradle
index 9ca758b..7598428 100644
--- a/1_16/build.gradle
+++ b/1_16/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'xyz.wagyourtail.unimined' version '1.3.9'
+    id 'xyz.wagyourtail.unimined' version '1.3.10'
     id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
 }
 
diff --git a/1_19/build.gradle b/1_19/build.gradle
index 40abf7e..2806dd0 100644
--- a/1_19/build.gradle
+++ b/1_19/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'xyz.wagyourtail.unimined' version '1.3.9'
+    id 'xyz.wagyourtail.unimined' version '1.3.10'
     id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
 }
 
diff --git a/1_20/build.gradle b/1_20/build.gradle
index 3e4c32a..46d5274 100644
--- a/1_20/build.gradle
+++ b/1_20/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'xyz.wagyourtail.unimined' version '1.3.9'
+    id 'xyz.wagyourtail.unimined' version '1.3.10'
     id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
 }
 
diff --git a/1_21/build.gradle b/1_21/build.gradle
index 2814e5d..689a64e 100644
--- a/1_21/build.gradle
+++ b/1_21/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'xyz.wagyourtail.unimined' version '1.3.9'
+    id 'xyz.wagyourtail.unimined' version '1.3.10'
     id 'io.github.headlesshq.headlessmc-gradle-plugin' version '0.3.0'
 }
 
diff --git a/1_21/gradle.properties b/1_21/gradle.properties
index cf5bf7a..6c1b2e3 100644
--- a/1_21/gradle.properties
+++ b/1_21/gradle.properties
@@ -1,9 +1,9 @@
 org.gradle.jvmargs = -Xmx2G
 
-minecraft_version = 1.21.1
+minecraft_version = 1.21.4
 mapping_version = 1
-neoforge_version = 22
-lexforge_version = 52.0.4
+neoforge_version = 70-beta
+lexforge_version = 54.0.17
 fabric_version = 0.14.24
 # Whether to use the headlessmc lwjgl agent or not
 hmc.lwjgl=true