Commit graph

19 commits

Author SHA1 Message Date
malte0811
316cc2ab78 Added a speedometer for automatic speed control
Fixed variacs and sliders on dedicated panels not working on world reload
2018-03-02 22:05:27 +01:00
malte0811
b913e28271 Updated copyright to 2018 2018-02-28 21:06:33 +01: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
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
b716c23e3d Added a way to create tilted panels in-game (no recipe yet)
Panels are no longer created from machine casings, but from unfinished panels
2017-06-30 21:04:43 +02:00
malte0811
d65621a0b5 Redstone control, other misc Marx generator details 2017-06-09 11:37:23 +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
4e84a0d020 Added an item model for the control panel
Added some localization&other item models
2017-04-28 20:20:52 +02:00
malte0811
d02981e14d Added models for the RS panel connector
Fixed every block dropping the meta=0 version
2017-04-24 17:26:42 +02:00
malte0811
8cabaa9844 Added textures for the panel creator GUI and the control panel block
Fixed bounding box direction on the Jacob's ladders
2017-04-17 19:35:14 +02:00
malte0811
0ee914b7e6 Further work on panel creation
Added items to represent the panel components
2017-04-13 17:14:05 +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
3641775ff5 Control panels now work when connected to multiple RS ports with the same ID
fixed rotation of Jacob's Ladders
2017-04-02 17:16:42 +02:00
malte0811
4ecab259dd More misc control panel stuff
Includes RS indicator lights
2017-04-01 17:33:58 +02:00
malte0811
b1ff95cf85 Further work on control panels
RS output is working (but depends on current master IE with an additional fix)
Model rotation on Jacobs ladders is broken!
2017-03-28 18:15:41 +02:00
malte0811
34bf534b1c started adding control panels. Very much WIP! 2017-03-24 17:40:05 +01:00
malte0811
b36e5c2623 General refactoring, IC2 connectors no longer use BlockIEBase! 2017-03-21 18:12:09 +01:00