Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/customitemapi' into customitemapi
Browse files Browse the repository at this point in the history 
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
  • Loading branch information
@eclipseisoffline
eclipseisoffline committed Jul 23, 2024
2 parents 13a0483 + e55eaa7 commit 24a36cc
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 24a36cc

Please sign in to comment.