Indyuce b9b61b1616 Merge remote-tracking branch 'origin/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-22 12:30:40 +01:00
..
src/main/java/net/Indyuce/mmoitems	Merge remote-tracking branch 'origin/adventure-like-impl'	2022-12-22 12:30:40 +01:00
pom.xml	Fixed an issue with ornaments; improved comp with MMOInv	2022-12-17 16:46:16 +01:00