3 commits

Author	SHA1	Message	Date
malte0811	c18d94899a	Change the structure of the Marx generator to not include IC2 blocks ... Finish up the texture/model Fix some bugs where the energy storage goes negative and starts charging the marx to -Infinity V	2017-08-13 18:46:46 +02:00
malte0811	5667768420	Merge branch 'MC1.12' into marx ... # Conflicts: # build.gradle # src/main/java/malte0811/industrialWires/IndustrialWires.java # src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanel.java # src/main/java/malte0811/industrialWires/blocks/hv/BlockJacobsLadder.java # src/main/java/malte0811/industrialWires/blocks/hv/TileEntityJacobsLadder.java # src/main/java/malte0811/industrialWires/client/ClientProxy.java # src/main/java/malte0811/industrialWires/client/render/TileRenderJacobsLadder.java # src/main/java/malte0811/industrialWires/controlpanel/PanelComponent.java	2017-08-07 22:03:07 +02:00
malte0811	5a80b2626b	Marx generator. It forms and breaks ... Models for mirrored marx generators are broken The IC2 cables drop as items due to missing IC2 API methods	2017-06-01 11:44:07 +02:00