Commit graph

122 commits

Author SHA1 Message Date
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
d68eb801c3 Started implementing ore processing 2017-06-25 18:00:48 +02:00
malte0811
9ae4bad8b6 Misc Marx stuff:
-The bottom cap charges faster now
-Tinnitus can be replaced by damage or nausea in the config file
-If the first cap is charged higher than the charging voltage it will only be discharged if the yellow signal is 0
-Improved handling of low stored power
2017-06-23 17:40:49 +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
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
d65621a0b5 Redstone control, other misc Marx generator details 2017-06-09 11:37:23 +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
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
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
8e845ab100 Added a key ring, holds up to 10 keys by default
texture might change, docs+recipe still to do
2017-05-20 18:50:04 +02:00
malte0811
695679caa2 Added textures for the key+lock switch
Renaming a key to an empty name returns it to its unnamed state
2017-05-20 17:14:43 +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
d3cd816f0c Added some IC2 items to the Engineer's toolbox 2017-05-15 21:40:43 +02:00
malte0811
6d4c4f7276 Added a remapper to stop wire connectors from vanishing when updating
They will be facing north though, so most of them will have to be broken and replaced
2017-05-13 20:13:40 +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
aca048cbee Added recipes for all panel related things
Apart from the missing textures everything is ready for a release
2017-05-09 17:25:03 +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
6717e7c815 Added a model for the panel creator 2017-04-29 18:54:21 +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
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
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
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
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
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
4a4360c98b Fixed invalid connections being possible, see BluSunrize/ImmersiveEngineering#1975 2017-03-21 18:16:21 +01:00
malte0811
b36e5c2623 General refactoring, IC2 connectors no longer use BlockIEBase! 2017-03-21 18:12:09 +01:00
malte0811
12e18534fe Fixed broken textures on the mechanical converters/motor with Chisel installed, closes #5 2017-03-07 16:52:54 +01: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