Commit graph

55 commits

Author SHA1 Message Date
malte0811 33cc33170e Fixed IO parts getting stuck with bad waveforms 2018-06-24 18:50:25 +02:00
malte0811 880d350720 Misc fixes for the mechanical multiblocks 2018-06-22 18:51:51 +02:00
malte0811 40eaa907ef Misc changes to the mechanical multiblocks 2018-06-17 21:06:15 +02:00
malte0811 0cda304c56 Finished up the manual entry on MechMB's 2018-06-04 18:10:52 +02:00
malte0811 448489b01f Add a simplified version of MultiblockTemplate to display MechMB parts in the manual
Updated the text splitter with the changes from the manual rewrite, fixed some additional bugs
2018-06-02 21:22:26 +02:00
malte0811 12510ecc5b The voltmeter can now measure the exact speed of a mechanical multiblock 2018-04-06 18:05:11 +02:00
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 8190a4c80e Prevent HV wires from connecting to manual breaker switches
The wire changes are on Maven now!
2018-02-04 17:00:31 +01:00
malte0811 ced4704b14 Added insulated wires for tin, copper and gold (textures ToDo)
Added a recipe for the discharge meter
2018-01-31 21:51:34 +01:00
malte0811 ff3c391ac5 Added a discharge meter, a device that can measure the energy in a Marx discharge
Also some experimental stuff for wire coils
2018-01-28 21:30:53 +01:00
malte0811 b0156b70a0 Build 1.6-23
Panel components have to be shift-clicked to place them in the world
2017-12-08 20:15:02 +01:00
malte0811 15cf1010aa Added a recipe for seven-segment displays 2017-12-08 17:17:15 +01:00
malte0811 09161bce5f Added a seven-segment display for control panels 2017-10-31 16:29:38 +01: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 9f6407e300 New ear damage distance formula. Manual and reality should match this time! 2017-10-09 20:31:01 +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 bd194462e1 Add a note to the MG manual entry that most analog panel components support dual-channel fine control 2017-09-04 17:03:43 +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 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 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 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 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 74c0115102 Added documentation on the key ring and fixed some bugs with it 2017-07-13 17:53:05 +02:00
malte0811 304c5e50a6 Added documentation on single-component panels 2017-07-13 17:14:37 +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 5f8ef84e0f Merge branch 'MC1.11' into marx 2017-06-23 17:33:13 +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 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 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
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 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 b36e5c2623 General refactoring, IC2 connectors no longer use BlockIEBase! 2017-03-21 18:12:09 +01:00
malte0811 59177870f1 added the manual entry on jacobs ladders
fixed jacobs ladders replacing other blocks on placement
2017-03-03 19:04:08 +01:00
malte0811 a15107025d Jacobs ladders cause damage when touched
applying salt to Jacobs ladder's colors the arc orange (due to sodium)
2017-03-03 17:52:22 +01:00