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

Browse Source

# Conflicts:
#	Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java
#	gradle.properties

...

This commit is contained in:

Auxilor

2020-12-10 20:57:30 +00:00

parent 0f372153ca fc4cd02017

commit d12c636bd2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available