tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
137 commits 14 branches 0 tags 2.9 MiB
Commit graph

77 commits

Author SHA1 Message Date
malte0811 d3b84e6823 Panel components update their color as soon as the value is changed in the GUI, rather than on closing the GUI 2017-10-31 16:44:29 +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 746a5d1b57 Improved rendering of the Marx generator in the manual 
The mach converter entry isn't duplicated any more
 2017-10-21 21:15:01 +02:00
malte0811 59527ba600 Added an auto-splitter for manual entries. Currently just used for the Marx generator entry. 2017-10-20 18:25:53 +02:00
malte0811 cc14d20595 Added shaders for the Marx generator and the Jacob's ladder 2017-10-10 18:31:32 +02:00
malte0811 e9449440fd Build 1.6-20 
Fix some Marx crashes on dedicated servers
Fix wires attached to MG's sometimes not rendering
Fix issues with tinnitus when setting volume to 0
 2017-09-15 20:03:23 +02:00
malte0811 d5d0dca298 Replace Albedo by Mirage 
Fix orientation of the Marx spark gap render
Fix lighting differences between mirrored and normal Marx gens
 2017-09-06 21:18:59 +02:00
malte0811 c8c2b5bf88 Lots of small fixes for the Marx generator 
Includes mirrored models. TODO: Recalculate normals for default models to fix lighting differences
 2017-09-04 22:04:53 +02:00
malte0811 8d4c0fcad2 Merge branch 'marx' into MC1.12 2017-09-04 17:42:50 +02:00
malte0811 ac7d36b5e7 Add documentation on the Marx generator 
Add a command to get/set/regenerate the marx energy factor
 2017-09-03 20:48:10 +02:00
malte0811 a732ffa6a9 Remove manual entries if IC2 isn't loaded 2017-09-02 18:03:16 +02:00
malte0811 bc1ebc9fa5 Add JEI support for the Marx generator 2017-08-29 21:31:22 +02:00
malte0811 e200185235 Add a separate sound for Marx misfirings 
Add a texture for the tinnitus potion effect
 2017-08-27 20:27:29 +02:00
malte0811 840869cd08 Fix some bugs&crashes when IC2 isn't installed 
Some general cleanup
 2017-08-23 22:30:24 +02:00
malte0811 ccc3c7ab12 IC2 is an optional dependency now, probably still buggy 
Fix the TE names
 2017-08-22 18:33:05 +02:00
malte0811 e003367bf7 Add a second snapping option to the panel creator. This allows snapping the left/right edge or center of a component to one of those of an existing component. 2017-08-21 21:08:30 +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 a61639052e Fix Marx discharge and spark gap render rotation 2017-08-16 18:28:54 +02:00
malte0811 505464c002 Discharges can fail if the total voltage is too low 
Added Albedo compat for the marx generator
 2017-08-15 21:37:53 +02:00
malte0811 c18d94899a Change the structure of the Marx generator to not include IC2 blocks 
Finish up the texture/model
Fix some bugs where the energy storage goes negative and starts charging the marx to -Infinity V
 2017-08-13 18:46:46 +02: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 1a304e169e Fixed GUI backgrounds not being darkened and item tooltips not showing in the Panel Creator GUI 2017-07-14 16:52:19 +02:00
malte0811 74c0115102 Added documentation on the key ring and fixed some bugs with it 2017-07-13 17:53:05 +02:00
malte0811 d0472b45b9 Update to 1.12: Everything except recipes done. Probably quite buggy 2017-07-09 18:10:06 +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 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 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 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 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 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