diff --git a/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch b/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
index 1e4e03fad70..9c58b45670f 100644
--- a/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
+++ b/paper-server/patches/features/0015-Rewrite-dataconverter-system.patch
@@ -217,7 +217,7 @@ index 0000000000000000000000000000000000000000..515f6691c72ffa82ac8b92646768be7a
 +}
 diff --git a/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java b/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ab0d941248c389fec08a5ca6e45f7f5bf72cae58
+index 0000000000000000000000000000000000000000..79b65b275a698d86cb43d8b14e9ed7f6bf5c9da6
 --- /dev/null
 +++ b/ca/spottedleaf/dataconverter/minecraft/MCVersionRegistry.java
 @@ -0,0 +1,485 @@
@@ -503,7 +503,7 @@ index 0000000000000000000000000000000000000000..ab0d941248c389fec08a5ca6e45f7f5b
 +            4314,
 +            4420,
 +            4424,
-+            // All up to 1.21.6-pre2
++            // All up to 1.21.6-rc1
 +        };
 +        Arrays.sort(converterVersions);
 +
@@ -708,10 +708,10 @@ index 0000000000000000000000000000000000000000..ab0d941248c389fec08a5ca6e45f7f5b
 +}
 diff --git a/ca/spottedleaf/dataconverter/minecraft/MCVersions.java b/ca/spottedleaf/dataconverter/minecraft/MCVersions.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..94e115808e1d1895cf36c87acea179c09e3c3d5b
+index 0000000000000000000000000000000000000000..469a3241f1d81d82394efbf8da3258210321046c
 --- /dev/null
 +++ b/ca/spottedleaf/dataconverter/minecraft/MCVersions.java
-@@ -0,0 +1,593 @@
+@@ -0,0 +1,596 @@
 +package ca.spottedleaf.dataconverter.minecraft;
 +
 +@SuppressWarnings("unused")
@@ -1302,6 +1302,9 @@ index 0000000000000000000000000000000000000000..94e115808e1d1895cf36c87acea179c0
 +    public static final int V25W21A               = 4429;
 +    public static final int V1_21_6_PRE1          = 4430;
 +    public static final int V1_21_6_PRE2          = 4431;
++    public static final int V1_21_6_PRE3          = 4432;
++    public static final int V1_21_6_PRE4          = 4433;
++    public static final int V1_21_6_RC1           = 4434;
 +
 +    private MCVersions() {}
 +}
@@ -32343,7 +32346,7 @@ index 0000000000000000000000000000000000000000..b028017b9c44821a8a313a04e0b10f5d
 +    }
 +}
 diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java
-index 0ced5a8990b9fa2bdda90eac0a1c7ab27effe0e9..3b97e8d90327d6fcb4c4149a1107f79ee8d33918 100644
+index 0c611598a6912b692a7639301811ee557e2304f1..6f65564f6a6e99d6549de9a23a031b1f4a8a9798 100644
 --- a/ca/spottedleaf/moonrise/paper/PaperHooks.java
 +++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java
 @@ -211,6 +211,43 @@ public final class PaperHooks extends BaseChunkSystemHooks implements PlatformHo