Auxilor cffa73da77 Merge remote-tracking branch 'origin/master' into master ...

# Conflicts:
#	Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java

2020-08-28 22:20:46 +01:00

..

java/com/willfp/ecoenchants

Merge remote-tracking branch 'origin/master' into master

2020-08-28 22:20:46 +01:00

resources

Added essentials integration

2020-08-28 21:52:09 +01:00