Nassim Jahnke feefe6f278 Merge branch 'master' into dev ... # Conflicts: # bukkit-legacy/src/main/java/com/viaversion/viaversion/bukkit/util/ProtocolSupportUtil.java # bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java # bungee/src/main/java/com/viaversion/viaversion/bungee/handlers/BungeeServerHandler.java # bungee/src/main/java/com/viaversion/viaversion/bungee/providers/BungeeVersionProvider.java # common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java # common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java # velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaInjector.java # velocity/src/main/java/com/viaversion/viaversion/velocity/service/ProtocolDetectorService.java		2024-03-22 20:54:44 +01:00
..
data	Update license headers	2024-01-01 12:39:45 +01:00
metadata	Update old metadata handlers, some cleanup	2024-01-09 20:43:43 +01:00
packets	Use equals in legacy custom payload channel comparisons (#3721)	2024-02-29 11:11:00 +01:00
providers	Update license headers	2024-01-01 12:39:45 +01:00
rewriter	Rewrite 1.11->1.12 ChatItemRewriter (#3740)	2024-03-09 10:58:42 +01:00
storage	Update license headers	2024-01-01 12:39:45 +01:00
ClientboundPackets1_12.java	Update license headers	2024-01-01 12:39:45 +01:00
Protocol1_12To1_11_1.java	Merge branch 'master' into dev	2024-03-22 20:54:44 +01:00
ServerboundPackets1_12.java	Update license headers	2024-01-01 12:39:45 +01:00