Not even sure...
Merge branch 'dev' of github.com:FlansMods/FlansMod into dev

Conflicts:
	src/main/java/com/flansmod/client/ClientProxy.java