Tim203 9f32ba81b1 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge ... # Conflicts: # bootstrap/bungeecord/base/build.gradle.kts # bootstrap/spigot/base/build.gradle.kts # bootstrap/spigot/base/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotInjector.java # bootstrap/velocity/base/build.gradle.kts # core/build.gradle.kts # core/src/main/java/org/geysermc/geyser/GeyserImpl.java # core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java # core/src/main/java/org/geysermc/geyser/entity/type/FireworkEntity.java # core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java # core/src/main/java/org/geysermc/geyser/session/GeyserSession.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCustomPayloadTranslator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaLoginTranslator.java # gradle.properties # gradle/libs.versions.toml # settings.gradle.kts		2024-05-09 18:04:56 +02:00
..
bungeecord	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge	2024-05-09 18:04:56 +02:00
mod	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge	2024-05-09 18:04:56 +02:00
spigot	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge	2024-05-09 18:04:56 +02:00
standalone	Merge remote-tracking branch 'origin/master' into feature/floodgate-merge	2024-02-25 20:12:43 +01:00
velocity	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge	2024-05-09 18:04:56 +02:00
viaproxy	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/floodgate-merge	2024-05-09 18:04:56 +02:00