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

91 commits

Author SHA1 Message Date
malte0811
12510ecc5b The voltmeter can now measure the exact speed of a mechanical multiblock 2018-04-06 18:05:11 +02:00
malte0811
184d12b7cb Maybe fixed the last of the energy transmission issues? 2018-04-02 18:12:01 +02:00
malte0811
b7bc55a0a9 A lot of bugfixes, also new models and textures for some of the parts 2018-03-27 21:31:03 +02:00
malte0811
1fb01d9abd Started adding 4-phase stuff 2018-03-23 16:27:32 +01: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
8cca1b13e1 Added the commutator, the essential part for medium-power conversion 
Also, textures! Some are s**t, esp the one for the magnet ring
 2018-02-28 21:03:26 +01:00
malte0811
56fb9e3b3a Merge branch 'MC1.12' into mechStuff 2018-02-19 20:39:55 +01:00
malte0811
23df4324ec Mechanical MB's disassemble properly now 
Started implementing mechanical failure (currently only for flywheels)
Changed the waveforms. This is supposed to be efficient!
 2018-02-17 20:37:53 +01:00
malte0811
8d98e30b04 More mech MB work 
This is getting somewhere!
 2018-02-13 19:23:02 +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
129d8f732a Added textures for the insulated wire coils 
Fixed incorrect/missing error messages when linking connectors
 2018-02-02 18:08:33 +01:00
malte0811
d3508e42fe More TMP commits 2018-02-02 17:20:53 +01:00
malte0811
6c60b4562b Merge branch 'MC1.12' into mechStuff 2018-02-01 20:56:12 +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
58692ceb76 TMP commit 2018-01-01 20:07:20 +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
d3b937433d Merge branch 'shaders' into MC1.12 2017-10-10 18:34:22 +02:00
malte0811
cc14d20595 Added shaders for the Marx generator and the Jacob's ladder 2017-10-10 18:31:32 +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
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
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
e5e400a1fa TR doesn't need special wires 2017-09-01 21:13:23 +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
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
92b00f199c Started adding single-component panel blocks. Very WIP 2017-07-12 20:20:11 +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
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
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
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