Merge remote-tracking branch 'origin/master' into master
# Conflicts: # gradle.properties
This commit is contained in:
@@ -7,7 +7,7 @@ website: willfp.com
|
||||
loadbefore:
|
||||
- EcoEnchants
|
||||
- Talismans
|
||||
- ItemStats
|
||||
- StatTrackers
|
||||
- EcoArmor
|
||||
- Illusioner
|
||||
depend:
|
||||
|
||||
Reference in New Issue
Block a user