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

# Conflicts:
#	gradle.properties
This commit is contained in:
Auxilor
2021-02-07 19:29:52 +00:00

View File

@@ -7,7 +7,7 @@ website: willfp.com
loadbefore:
- EcoEnchants
- Talismans
- ItemStats
- StatTrackers
- EcoArmor
- Illusioner
depend: