onebeastchris 35e59d3a99 Merge remote-tracking branch 'upstream/master' into feature/1.21.6 ...

# Conflicts:
#	core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java

2025-06-18 01:31:07 +02:00

..

java/org/geysermc/geyser

Merge remote-tracking branch 'upstream/master' into feature/1.21.6

2025-06-18 01:31:07 +02:00

java-templates/org/geysermc/geyser

Show build number in startup log, fix Geyser version command(#4336)

2024-06-22 20:32:29 +02:00

resources

Merge remote-tracking branch 'upstream/master' into feature/1.21.6

2025-06-18 01:31:07 +02:00