Commit graph

13 commits

Author SHA1 Message Date
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 143311aecf Effects of Marx discharges on entities:
Damage for thos close to the discharge, tinnitus for those further out
Also added a nice bang for discharges (it is from a cap bank rather than a Marx though)
2017-06-16 22:04:30 +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 5165d55218 Started adding locks for panels 2017-05-18 18:13:08 +02:00
malte0811 01c2e58409 Updated to MC 1.11, part 1
Compiles and runs, but probably doesn't really work yet
2017-05-10 17:56:05 +02:00
malte0811 1d83fa7579 Added a GUI for editing panel components
Currently only available for buttons
2017-04-20 20:44:08 +02:00
malte0811 ee827b46ef Started implementing a GUI for creating control panels
fixed the default value for euPerIf, closes #6
2017-04-12 15:55:37 +02:00
malte0811 4bda8d458c fixed a crash on dedicated servers because for some reason AABB(Vec3d, Vec3d) is client-only
fixed copyright comments
2017-04-10 16:20:39 +02:00
malte0811 838e9c2af4 Control panels now drop properly and can be placed
added a basic GUI to panel RS connectors to allow changing the ID
2017-04-09 16:59:57 +02: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
malte0811 c6c0bb00c9 added a license: GPL3
added a changelog
changed build.gradle to automatically download IC2
added Curse as a valid IC2 download location
2016-09-29 16:26:03 +02:00
malte0811 d8bbbb8170 initial commit 2016-09-16 16:47:59 +02:00