Fixes CanaryModTeam/CanaryLib#12
Merge branch 'master' of github.com:CanaryModTeam/CanaryMod

Conflicts:
	src/main/java/net/canarymod/api/entity/living/CanaryLivingBase.java