Nassim Jahnke 680d0642c9 Merge branch 'master' into dev ... # Conflicts: # common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/rewriter/BlockItemPacketRewriter1_20_3.java		2024-01-31 22:58:51 +01:00
..
java/com/viaversion/viabackwards	Merge branch 'master' into dev	2024-01-31 22:58:51 +01:00
java-templates/com/viaversion/viabackwards/utils	[ci skip] Update Blossom	2023-09-06 11:30:10 +10:00
resources/assets/viabackwards	24w05a (mostly)	2024-01-31 18:06:46 +01:00