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
..
CollisionChecker.java	Small random cleanup	2024-02-11 10:46:08 +01:00
NMSUtil.java	Update license headers	2024-01-01 12:39:45 +01:00
ProtocolSupportUtil.java	Merge branch 'master' into dev	2024-03-22 20:54:44 +01:00