Added most of the remaining MCPC+ patches from 1.6.