mmoitems/MMOItems-API
Roch Blondiaux 46fc12fee6 Merge branch 'master' into 'adventure-like-impl'
# Conflicts:
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/item/util/crafting/CraftingRecipeDisplay.java
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/gui/ItemBrowser.java
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java
2022-12-21 10:54:34 +00:00
..
src/main/java/net/Indyuce/mmoitems Merge branch 'master' into 'adventure-like-impl' 2022-12-21 10:54:34 +00:00
pom.xml Fixed citizens dep 2022-11-14 10:56:11 +01:00