Fixed cheese block pick block (1.6)
Merge pull request #494 from SteveMCCommander/patch-9

Fixed cheese block pick block (1.6)
Make Desh Ore more common in Mars world gen.
Buildcraft compatibility - new conversion ratio and power loss.  Fixes #474.
IC2 compatibility - allow aluminium wires to explode IC2 machines [TESTING]
Revert the experimental IC2 compatibility change back to normal.
Compatibility: default TE3 conversion ratio reverted to 1/10 BC ratio; new config to allow unsafe energy from alu wire into IC2 machines.
Electricity network - performance increase.
Merge some recent 1.6 branch fixes into master.
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft