Updated BlockCamo to 1.7
Updated BlockEnchanter to 1.7
Updated BlockFunnel to 1.7
Merge remote-tracking branch 'origin/1.7' into 1.7