Josh Roy 99357fcca2 Merge branch '2.x' into rework/providers ... # Conflicts: # Essentials/src/main/java/com/earth2me/essentials/Essentials.java # Essentials/src/main/java/com/earth2me/essentials/IEssentials.java # Essentials/src/main/java/com/earth2me/essentials/Kit.java # Essentials/src/main/java/com/earth2me/essentials/MetaItemStack.java # Essentials/src/main/java/com/earth2me/essentials/Settings.java # Essentials/src/main/java/com/earth2me/essentials/commands/Commandanvil.java # Essentials/src/main/java/com/earth2me/essentials/commands/Commandcartographytable.java # Essentials/src/main/java/com/earth2me/essentials/commands/Commandcreatekit.java # Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java # Essentials/src/main/java/com/earth2me/essentials/commands/Commandgrindstone.java # Essentials/src/main/java/com/earth2me/essentials/commands/Commandloom.java # Essentials/src/main/java/com/earth2me/essentials/commands/Commandsmithingtable.java # Essentials/src/main/java/com/earth2me/essentials/commands/Commandstonecutter.java # Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java # Essentials/src/main/java/com/earth2me/essentials/items/FlatItemDb.java # Essentials/src/main/java/com/earth2me/essentials/items/LegacyItemDb.java # Essentials/src/main/java/com/earth2me/essentials/signs/SignAnvil.java # Essentials/src/main/java/com/earth2me/essentials/signs/SignCartography.java # Essentials/src/main/java/com/earth2me/essentials/signs/SignGrindstone.java # Essentials/src/main/java/com/earth2me/essentials/signs/SignLoom.java # Essentials/src/main/java/com/earth2me/essentials/signs/SignSmithing.java # Essentials/src/main/java/com/earth2me/essentials/utils/LocationUtil.java		2024-02-12 10:43:13 -05:00
..
src/main/java/net/ess3/provider/providers	Rework the provider system	2022-08-23 19:59:34 -04:00
build.gradle	We're going on an Adventure! (#4717)	2024-02-03 20:38:14 +00:00