Geyser/core
Tim203 99671960d0
Merge remote-tracking branch 'origin/master' into jwt-changes
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java
2023-06-27 12:12:31 +02:00
..
src Merge remote-tracking branch 'origin/master' into jwt-changes 2023-06-27 12:12:31 +02:00
build.gradle.kts Exposing resourcepack loading to api (#3696) 2023-06-16 20:39:53 -05:00