Merge pull request #473 from AartBluestoke/dev

many critical fixes
Added AE compatibility.
Clean up.
Merge branch 'MC-1.4' into Dev