malte0811
|
bc1ebc9fa5
|
Add JEI support for the Marx generator
|
2017-08-29 21:31:22 +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
|
963755af78
|
Wire connections and bounding boxes for the Marx generator
Some misc stuff
|
2017-06-03 21:06:25 +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 |
|