Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken.
Merge branch 'master' of https://github.com/aidancbrady/Mekanism

Conflicts:
	common/mekanism/common/TileEntityUniversalCable.java