Eclipse f6f6423d25 Merge remote-tracking branch 'upstream/master' into custom-item-api-v2 ... # Conflicts: # core/src/main/java/org/geysermc/geyser/item/type/Item.java # core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java # core/src/main/java/org/geysermc/geyser/translator/item/CustomItemTranslator.java # core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaCooldownTranslator.java		2024-12-12 10:18:55 +00:00
..
src/main	Merge remote-tracking branch 'upstream/master' into custom-item-api-v2	2024-12-12 10:18:55 +00:00
build.gradle.kts	First work on a new API (wow that's a lot of TODOs)	2024-11-29 14:01:25 +00:00