onebeastchris 9279c70624 Merge remote-tracking branch 'refs/remotes/origin/rp' into subpacks-rewrite-merge-urlpacks ... # Conflicts: # api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionLoadResourcePacksEvent.java # core/src/main/java/org/geysermc/geyser/event/type/SessionLoadResourcePacksEventImpl.java # core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java # core/src/main/java/org/geysermc/geyser/pack/GeyserResourcePack.java # core/src/main/java/org/geysermc/geyser/registry/loader/ProviderRegistryLoader.java # core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java		2024-08-20 20:06:34 +02:00
..
src/main	Merge remote-tracking branch 'refs/remotes/origin/rp' into subpacks-rewrite-merge-urlpacks	2024-08-20 20:06:34 +02:00
build.gradle.kts	Extensions should specify geyser api version in the extension.yml (#3880)	2024-07-31 20:01:31 -05:00