malte0811
|
2b2f5ca6c1
|
Replace the ore-specific energy values with one global constant, to make it possible to determine the constant with cheap ores
Fix a crash when interacting with the top/bottom side of a HV capacitor
|
2017-08-14 21:56:44 +02:00 |
|
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
|
d68eb801c3
|
Started implementing ore processing
|
2017-06-25 18:00:48 +02:00 |
|