ViaVersion/common/src/main/java/com/viaversion/viaversion/protocols
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
..
base Merge branch 'master' into dev 2024-03-22 20:54:44 +01:00
protocol1_8 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_9_1to1_9 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_9_3to1_9_1_2 Replace tag instanceof checks/unchecked casts with helper methods 2024-02-10 23:28:36 +01:00
protocol1_9to1_8 Merge branch 'master' into dev 2024-03-22 20:54:44 +01:00
protocol1_10to1_9_3 Replace tag instanceof checks/unchecked casts with helper methods 2024-02-10 23:28:36 +01:00
protocol1_11_1to1_11 We continue to fall 2024-03-01 13:46:26 +01:00
protocol1_11to1_10 Merge branch 'master' into dev 2024-03-22 20:54:44 +01:00
protocol1_12_1to1_12 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_12_2to1_12_1 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_12to1_11_1 Merge branch 'master' into dev 2024-03-22 20:54:44 +01:00
protocol1_13_1to1_13 Replace tag instanceof checks/unchecked casts with helper methods 2024-02-10 23:28:36 +01:00
protocol1_13_2to1_13_1 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_13to1_12_2 Merge branch 'master' into dev 2024-03-22 20:54:44 +01:00
protocol1_14_1to1_14 Update old metadata handlers, some cleanup 2024-01-09 20:43:43 +01:00
protocol1_14_2to1_14_1 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_14_3to1_14_2 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_14_4to1_14_3 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_14to1_13_2 Merge branch 'master' into dev 2024-03-07 13:45:10 +01:00
protocol1_15_1to1_15 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_15_2to1_15_1 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_15to1_14_4 Replace tag instanceof checks/unchecked casts with helper methods 2024-02-10 23:28:36 +01:00
protocol1_16_1to1_16 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_16_2to1_16_1 Update ViaNBT 2024-03-07 13:30:33 +01:00
protocol1_16_3to1_16_2 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_16_4to1_16_3 Update license headers 2024-01-01 12:39:45 +01:00
protocol1_16to1_15_2 Merge branch 'master' into dev 2024-03-09 12:59:36 +01:00
protocol1_17_1to1_17 Update ViaNBT 2024-03-07 13:30:33 +01:00
protocol1_17to1_16_4 Update ViaNBT 2024-03-09 12:57:55 +01:00
protocol1_18_2to1_18 Update ViaNBT 2024-03-09 12:57:55 +01:00
protocol1_18to1_17_1 Move some data out of extending MappingData classes 2024-02-13 18:41:05 +01:00
protocol1_19_1to1_19 Merge branch 'master' into dev 2024-03-09 12:59:36 +01:00
protocol1_19_3to1_19_1 We continue to fall 2024-03-01 13:46:26 +01:00
protocol1_19_4to1_19_3 Merge branch 'master' into dev 2024-03-09 12:59:36 +01:00
protocol1_19to1_18_2 Merge branch 'master' into dev 2024-03-09 12:59:36 +01:00
protocol1_20_2to1_20 Merge branch 'master' into dev 2024-03-07 13:45:10 +01:00
protocol1_20_3to1_20_2 Use the correct entity sound rewriter method 2024-03-14 14:43:37 +01:00
protocol1_20_5to1_20_3 Merge branch 'master' into dev 2024-03-07 13:45:10 +01:00
protocol1_20to1_19_4 Use the correct entity sound rewriter method 2024-03-14 14:43:37 +01:00