Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into master
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
WillFP committed Feb 7, 2021
2 parents 32e119d + 2faf373 commit e31857a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion eco-core/core-plugin/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ website: willfp.com
loadbefore:
- EcoEnchants
- Talismans
- ItemStats
- StatTrackers
- EcoArmor
- Illusioner
depend:
Expand Down

0 comments on commit e31857a

Please sign in to comment.