as
Merge branch 'master' of https://github.com/Surseance/EnderGloves

Conflicts:
	src/main/java/enderglove/client/ClientProxy.java

src/main/java/enderglove/client/renderers/item/ItemEnderGloveRenderer.ja
va
	src/main/java/enderglove/client/renderers/item/ModelEnderGlove.java
	src/main/java/enderglove/common/EnderGlove.java