Commit graph

16 commits

Author SHA1 Message Date
malte0811
1959b93f5b Fixed some potential CME's
IC2 feedthrough connectors properly disassemble now
2018-04-06 18:25:46 +02:00
malte0811
b913e28271 Updated copyright to 2018 2018-02-28 21:06:33 +01: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
cbac269e04 Updated mappings to match the ones used by IE 2017-06-25 18:34:10 +02:00
malte0811
d4bed0d324 Added a render for the Marx generator 2017-06-02 17:57:17 +02:00
malte0811
5165d55218 Started adding locks for panels 2017-05-18 18:13:08 +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
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
c680f9a466 Added manual entries for control panel related things
Fixed some problems when playing on a dedicated server
2017-05-08 21:29:45 +02:00
malte0811
7cc0d9d9fe Added toggle switches, including a version with a cover to prevent accidental activation 2017-05-08 17:20:04 +02:00
malte0811
c15e68a716 Added textures for the panel component items
Made it possible to pick up single components from the panel creator GUI
2017-04-27 18:15:11 +02:00
malte0811
0327322198 Added editing GUI's for the other components
fixed a potential component dupe bug
2017-04-22 18:14:49 +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
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
3d4c2ef1f4 Added sliders to control panels, they can be used to set an RS signal between 0 and 15
Commented out the IE gradle dependency since no maven build of IE works with control panels yet (latest master does though)
2017-04-04 17:11:50 +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