diff --git a/gradle.properties b/gradle.properties
index 1dc8950877..f2dc62aea7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-enigma_version=0.21.4+build.225
+enigma_version=0.21.6+build.229
 stitch_version=0.5.1+build.77
diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping
index 428f9fc55e..4ba6b486bb 100644
--- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping
+++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping
@@ -10,10 +10,9 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi
 	FIELD field_26581 LAN_SCANNING_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26582 CANNOT_RESOLVE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26583 CANNOT_CONNECT_TEXT Lnet/minecraft/class_2561;
-	FIELD field_26584 CLIENT_OUT_OF_DATE_TEXT Lnet/minecraft/class_2561;
-	FIELD field_26585 SERVER_OUT_OF_DATE_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26586 NO_CONNECTION_TEXT Lnet/minecraft/class_2561;
 	FIELD field_26587 PINGING_TEXT Lnet/minecraft/class_2561;
+	FIELD field_26849 INCOMPATIBLE_TEXT Lnet/minecraft/class_2561;
 	METHOD <init> (Lnet/minecraft/class_500;Lnet/minecraft/class_310;IIIII)V
 		ARG 1 screen
 		ARG 2 client
diff --git a/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping
index f68fba6a25..45221316be 100644
--- a/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping
+++ b/mappings/net/minecraft/client/render/entity/model/ShulkerEntityModel.mapping
@@ -4,5 +4,4 @@ CLASS net/minecraft/class_602 net/minecraft/client/render/entity/model/ShulkerEn
 	FIELD field_3555 topShell Lnet/minecraft/class_630;
 	METHOD method_2829 getTopShell ()Lnet/minecraft/class_630;
 	METHOD method_2830 getHead ()Lnet/minecraft/class_630;
-	METHOD method_2831 getBottomShell ()Lnet/minecraft/class_630;
 	METHOD method_32041 getTexturedModelData ()Lnet/minecraft/class_5607;
diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping
index a3f79c3408..865218e0ef 100644
--- a/mappings/net/minecraft/potion/PotionUtil.mapping
+++ b/mappings/net/minecraft/potion/PotionUtil.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil
-	FIELD field_25817 NONE_TEXT Lnet/minecraft/class_5250;
+	FIELD field_25817 NONE_TEXT Lnet/minecraft/class_2561;
 	METHOD method_8055 getColor (Ljava/util/Collection;)I
 		ARG 0 effects
 	METHOD method_8056 setCustomPotionEffects (Lnet/minecraft/class_1799;Ljava/util/Collection;)Lnet/minecraft/class_1799;
diff --git a/mappings/net/minecraft/client/util/math/Vector3f.mapping b/mappings/net/minecraft/util/math/Vec3f.mapping
similarity index 96%
rename from mappings/net/minecraft/client/util/math/Vector3f.mapping
rename to mappings/net/minecraft/util/math/Vec3f.mapping
index 0e32fe12f7..66d765afc6 100644
--- a/mappings/net/minecraft/client/util/math/Vector3f.mapping
+++ b/mappings/net/minecraft/util/math/Vec3f.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_1160 net/minecraft/client/util/math/Vector3f
+CLASS net/minecraft/class_1160 net/minecraft/util/math/Vec3f
 	FIELD field_20702 NEGATIVE_X Lnet/minecraft/class_1160;
 	FIELD field_20703 POSITIVE_X Lnet/minecraft/class_1160;
 	FIELD field_20704 NEGATIVE_Y Lnet/minecraft/class_1160;