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
c53b09b6ce
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-06 18:15:08 +02:00
malte0811
d0472b45b9
Update to 1.12: Everything except recipes done. Probably quite buggy
2017-07-09 18:10:06 +02:00
malte0811
cbac269e04
Updated mappings to match the ones used by IE
2017-06-25 18:34:10 +02:00
malte0811
d65621a0b5
Redstone control, other misc Marx generator details
2017-06-09 11:37:23 +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
d4bed0d324
Added a render for the Marx generator
2017-06-02 17:57:17 +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
malte0811
23c1afc44b
Glowing components like the indicator light actuall glow in the dark now
...
Some bugfixes
Complete code reformatting
2017-05-11 16:39:20 +02:00
malte0811
c3d871aa37
Build 7
...
fixed the Jacob's Ladders breaking when trying to rotate them
fixed sharp rendering edges inside "salted" arcs
2017-03-06 16:47:16 +01:00
malte0811
a15107025d
Jacobs ladders cause damage when touched
...
applying salt to Jacobs ladder's colors the arc orange (due to sodium)
2017-03-03 17:52:22 +01:00
malte0811
7c9d8ff8fb
added textures for the jacobs ladders
...
fixed the normal sized ladder missing a bit of rendering
limited energy input to the side marked as such
2017-03-02 17:26:24 +01:00
malte0811
8a12144490
Progress on the jacobs ladders:
...
added models for the small and normal sized versions
made them rotatable
fixed sound
energy storage is saved to NBT now
2017-02-28 17:32:40 +01:00
malte0811
2edc831d19
added Jacobs Ladders, part 1
...
rendering and sound are done, as well as energy usage
ToDo: finish the dimensions of the different ladders, add models for small+normal, recipes, probably a lot more...
2017-02-26 14:04:23 +01:00
