Merge Rourke's EnderExpansion changes
Merge branch 'master' of github.com:erocs/PrisonPearl