Add proper IC2 item support, add maganese for future use
Merge branch 'master' of https://github.com/aidancbrady/Mekanism

Conflicts:
	common/mekanism/common/Mekanism.java