onebeastchris 0ac91ebc25 Merge remote-tracking branch 'upstream/master' into rp ... # Conflicts: # core/src/main/java/org/geysermc/geyser/configuration/GeyserConfiguration.java # core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java		2023-12-21 20:24:39 +01:00
..
src/main/java/org/geysermc/geyser/api	Merge remote-tracking branch 'upstream/master' into rp	2023-12-21 20:24:39 +01:00
build.gradle.kts	Moved the base api to a separate repo	2023-02-09 17:31:00 +01:00