Commit graph

47 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
6c60b4562b Merge branch 'MC1.12' into mechStuff 2018-02-01 20:56:12 +01:00
malte0811
58692ceb76 TMP commit 2018-01-01 20:07:20 +01:00
malte0811
2df8bc4f29 Build 1.6-22
Stop using JavaFX vectors as they don't seem to exist in a normal instance
2017-10-31 17:16:25 +01:00
malte0811
09161bce5f Added a seven-segment display for control panels 2017-10-31 16:29:38 +01:00
malte0811
e21684818f Possibly fixed a race condition NPE with panel models 2017-10-29 13:59:27 +01:00
malte0811
543368ad7c Fixed crashes with 2-channel components where the second id is selected, but not the channel 2017-10-27 21:08:17 +02:00
malte0811
a35150f8e7 Possibly fixed a weird crash when placing control panels? 2017-10-27 18:52:08 +02:00
malte0811
9f6407e300 New ear damage distance formula. Manual and reality should match this time! 2017-10-09 20:31:01 +02:00
malte0811
f62a13596b Add second-channel support to the Variac, the Panel Meter and the slider 2017-08-18 22:41:33 +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
304c5e50a6 Added documentation on single-component panels 2017-07-13 17:14:37 +02:00
malte0811
1def161870 Single-component panels are complete, just docs and probably bugfixes to do 2017-07-13 09:23:41 +02:00
malte0811
9ee44021bc Update to 1.12: Recipes
The recipe book is quite inconsistent about NBT...
2017-07-10 17:59:43 +02:00
malte0811
d0472b45b9 Update to 1.12: Everything except recipes done. Probably quite buggy 2017-07-09 18:10:06 +02:00
malte0811
0a772758ae Build 1.5-13
Fixed labels breaking the model cache and on dedicated servers, closes #10
2017-07-04 18:16:13 +02:00
malte0811
292c150466 Possibly improved transformation performance, closes #10 2017-07-03 21:08:39 +02:00
malte0811
f8f2de930e Fixed panels not updating when a connection via panel connectors is broken or placed 2017-07-03 20:38:31 +02:00
malte0811
6a1081f47c Fixed a CME when chunk rendering is multithreaded, see #10 2017-07-03 19:46:18 +02:00
malte0811
7dc33fb296 Finished up tilted panels:
-Some Bugfixes
-Added recipes and documentation
2017-07-02 20:37:47 +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
15674f7ae3 Added tilted panels. Currently they can only be created by editing the panels NBT data 2017-06-28 21:41:50 +02:00
malte0811
cbac269e04 Updated mappings to match the ones used by IE 2017-06-25 18:34:10 +02:00
malte0811
5f8ef84e0f Merge branch 'MC1.11' into marx 2017-06-23 17:33:13 +02:00
malte0811
c262866b4d Build 1.5-11
Fixed some Z-fighting on the Variacs
2017-06-17 17:50:16 +02:00
malte0811
e9a2ade95a Allowed multiple components on the same panel network to modify the same RS signal
Cleaned up RS output code for panel components
Removed IC2's maven from build.gradle, since it is currently offline
2017-06-17 17:22:44 +02:00
malte0811
206c1170f1 Merge branch 'MC1.11' into marx 2017-06-05 17:23:18 +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
b9f5a8a9f8 Added (analog) panel meters
Fixed locks breaking the model cache
Ported the fix for #7
2017-05-27 17:02:18 +02:00
malte0811
6a2ce4685b Finished up the lock switch, just missing textures now
Added a recipe to copy settings from one panel component to another
Some internal changes
2017-05-19 17:45:30 +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
06d8ddfff9 Merge remote-tracking branch 'origin/master' into MC1.11 2017-05-10 17:56:23 +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
7eecdea794 Build 1.4-8
Added the missing textures
Fixed a few minor bugs
2017-05-10 13:20:00 +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
bf66a0fdc7 Added a variable transformer/Variac to put on control panels 2017-05-03 18:08:52 +02:00
malte0811
4586e57b84 Control panels can be disassembled in the panel creator now
added the missing background textures
changed the "base item" for control panels to be a basic machine casing
2017-05-01 18:40:29 +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
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
3739fc127c Stopped the user from placing overlapping components
Fixed GUI String rendering size
Fixed panel components not stacking in some situations
Slider length has to be greater than 0.125 now
2017-04-23 17:23:10 +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
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