onebeastchris 6d4ae9680f Merge remote-tracking branch 'refs/remotes/upstream/master' into subpacks-rewrite-merge-urlpacks ... # Conflicts: # core/src/main/java/org/geysermc/geyser/item/enchantment/Enchantment.java		2024-09-19 18:46:53 +08:00
..
src/main/java/org/geysermc/geyser/platform/velocity	Merge remote-tracking branch 'refs/remotes/upstream/master' into subpacks-rewrite-merge-urlpacks	2024-09-19 18:46:53 +08:00
build.gradle.kts	Gradle: avoid cross-configuration and enable configuration-on-demand (#5012)	2024-09-03 00:54:50 -04:00