Fixes CanaryEntity->LivingBase->EntityLiving.
Merge branch 'master' of github.com:canarymodteam/CanaryMod