Merge remote-tracking branch 'origin/master' into feature/floodgate-merge

# Conflicts:
#	core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
This commit is contained in:
Tim203 2024-03-18 16:38:52 +01:00
commit 120b367a41
No known key found for this signature in database
48 changed files with 12785 additions and 232 deletions

View file

@ -6,14 +6,14 @@ erosion = "1.0-20230406.174837-8"
events = "1.1-SNAPSHOT"
jackson = "2.14.2"
fastutil = "8.5.2"
netty = "4.1.103.Final"
netty = "4.1.107.Final"
guava = "29.0-jre"
gson = "2.3.1" # Provided by Spigot 1.8.8
websocket = "1.5.1"
protocol = "3.0.0.Beta1-20240204.134050-120"
protocol-connection = "3.0.0.Beta1-20240204.134050-119"
protocol = "3.0.0.Beta1-20240313.120922-126"
protocol-connection = "3.0.0.Beta1-20240313.120922-125"
raknet = "1.0.0.CR1-20231206.145325-12"
blockstateupdater="1.20.60-20240129.140535-1"
blockstateupdater="1.20.70-20240303.125052-2"
mcauthlib = "d9d773e"
mcprotocollib = "1.20.4-2-20240116.220521-7"
adventure = "4.14.0"