Merge branch '1.20.6-rc1' into 1.20.5-rc2

1.20.6-rc1 stuff (#3856 )
2024-04-26 13:36:36 +00:00 · 2024-04-26 23:18:33 +10:00 · 2024-04-26 13:13:14 +00:00 · 2024-04-26 13:55:44 +01:00 · 2024-04-23 16:01:58 +01:00 · 2024-04-22 18:30:57 +01:00
4 changed files with 6 additions and 1 deletions
--- a/build.gradle
+++ b/build.gradle
@ -20,7 +20,7 @@ plugins {
 	id 'net.fabricmc.filament'
 }

-def minecraft_version = "1.20.5-rc2"
+def minecraft_version = "1.20.6-rc1"

 filament {
 	minecraftVersion = minecraft_version
--- a/mappings/net/minecraft/block/entity/BlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@ -262,6 +262,9 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
 	METHOD method_58693 getComponents ()Lnet/minecraft/class_9323;
 	METHOD method_59535 createComponentlessNbtWithIdentifyingData (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487;
 		ARG 1 registryLookup
+	METHOD method_59894 tryParseCustomName (Ljava/lang/String;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2561;
+		ARG 0 json
+		ARG 1 registryLookup
 	CLASS class_9472 Components
 		FIELD field_50176 CODEC Lcom/mojang/serialization/Codec;
 	CLASS class_9473 ComponentsAccess
--- a/mappings/net/minecraft/datafixer/schema/Schema3808_2.mapping
+++ b/mappings/net/minecraft/datafixer/schema/Schema3808_2.mapping
@ -0,0 +1 @@
+CLASS net/minecraft/class_9688 net/minecraft/datafixer/schema/Schema3808_2
--- a/mappings/net/minecraft/registry/SimpleRegistry.mapping
+++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping
@ -16,6 +16,7 @@ CLASS net/minecraft/class_2370 net/minecraft/registry/SimpleRegistry
 	FIELD field_41126 key Lnet/minecraft/class_5321;
 	FIELD field_41127 wrapper Lnet/minecraft/class_7225$class_7226;
 	FIELD field_49135 keyToEntryInfo Ljava/util/Map;
+	FIELD field_51521 tagLock Ljava/lang/Object;
 	METHOD <init> (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V
 		ARG 1 key
 		ARG 2 lifecycle
Author	SHA1	Message	Date
github-actions[bot]	5b1f4e57f0	Merge branch '1.20.6-rc1' into 1.20.5-rc2	2024-04-26 13:36:36 +00:00
Shnupbups	7ccdf6dc8f	1.20.6-rc1 stuff (#3856 )	2024-04-26 23:18:33 +10:00
github-actions[bot]	3edb0befbb	Merge branch '1.20.6-rc1' into 1.20.5-rc2	2024-04-26 13:13:14 +00:00
modmuss50	763ec9232a	1.20.6-rc1	2024-04-26 13:55:44 +01:00
modmuss50	2c04481e90	1.20.5	2024-04-23 16:01:58 +01:00
apple502j	218f5403be	Map one field in `SimpleRegistry` (#3854 )	2024-04-22 18:30:57 +01:00
modmuss50	4c5d068d98	1.20.5-rc3	2024-04-22 15:24:36 +01:00
				`@ -0,0 +1 @@`
				`CLASS net/minecraft/class_9688 net/minecraft/datafixer/schema/Schema3808_2`