Fixed Fix for #470 And made enchant not work on gem boots
Merge remote-tracking branch 'origin/develop' into develop