some stuff happened
Merge branch 'master' of https://github.com/hotelcalifornia/poisoncraft

Conflicts:
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
	src/main/java/com/hotelc/poisoncraft/Poisoncraft.java
	src/main/java/com/hotelc/poisoncraft/item/Items.java
	src/main/java/com/hotelc/poisoncraft/proxy/ClientProxy.java
	src/main/java/com/hotelc/poisoncraft/proxy/CommonProxy.java
uuummm... github?