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
..
commands	Update license headers	2024-01-01 12:39:45 +01:00
handlers	Merge branch 'master' into dev	2024-03-22 20:54:44 +01:00
listeners	Replace printStackTrace usages with proper logging (#3741)	2024-03-09 13:57:41 +01:00
platform	Some code cleanup (#3698)	2024-02-14 22:53:50 +01:00
providers	Merge branch 'master' into dev	2024-03-22 20:54:44 +01:00
service	Port of internals and API to ProtocolVersion (#3694)	2024-02-14 17:56:28 +01:00
storage	Replace printStackTrace usages with proper logging (#3741)	2024-03-09 13:57:41 +01:00
util	Update license headers	2024-01-01 12:39:45 +01:00