Power Base, will change a lot
Renderers updated
Merge branch 'powerTest'
Merge branch 'master' of
https://github.com/tobiasvdp/industrialProcessing.git

Conflicts:
	src/minecraft/ip/industrialProcessing/IndustrialProcessing.java
	src/minecraft/ip/industrialProcessing/client/ClientProxy.java
	src/minecraft/ip/industrialProcessing/config/ConfigRenderers.java
	src/minecraft/ip/industrialProcessing/machines/Model.java
	src/minecraft/ip/industrialProcessing/machines/RendererTileEntity.java
	src/minecraft/ip/industrialProcessing/machines/diskFilter/ModelDiskFilter.java
	src/minecraft/ip/industrialProcessing/machines/filter/ModelFilter.java
	src/minecraft/ip/industrialProcessing/machines/magneticSeparator/ModelMagneticSeperator.java
	src/minecraft/ip/industrialProcessing/machines/mixer/ModelMixer.java