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

73 commits

Author SHA1 Message Date
malte0811 33cc33170e Fixed IO parts getting stuck with bad waveforms 2018-06-24 18:50:25 +02:00
malte0811 40eaa907ef Misc changes to the mechanical multiblocks 2018-06-17 21:06:15 +02:00
malte0811 3d2865aa93 Basic separated energy inputs/outputs for MechMB's 2018-06-16 19:15:15 +02:00
malte0811 375c30d139 Some cleanup, fixed another issue along the lines of #28 2018-06-15 16:15:06 +02:00
malte0811 7008f53faa Fixed some errors and issues on dedicated servers 2018-06-13 19:09:35 +02:00
malte0811 63603d12f1 Earmuffs work better with mechanical multiblocks now 2018-06-13 18:29:10 +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 7ebf25b3d5 Improve sound by using ITickableSound as opposed to starting and stopping the sound every tick 2018-05-27 13:32:43 +02:00
malte0811 b3fefaa078 New sound files! 
Fixed broken parts spawning in wrong places sometimes
Some changes to sound volume/pitch calculation
 2018-05-26 18:18:53 +02:00
malte0811 b43150d6c9 Fixed UV's for the ends of the shaft 2018-05-13 18:54:56 +02:00
malte0811 eb7f73464f Misc fixes, mostly related to sound and the "broken parts" entities 2018-05-12 19:04:38 +02:00
malte0811 3f08c47a73 Sound system is mostly done, I'll probably record new versions of the sounds in a few weeks (to remove frequency changes within a segment) 2018-05-06 20:33:24 +02:00
malte0811 b12501a86c Mech MB sound, take 1 2018-04-22 22:14:08 +02:00
malte0811 bd0c941ac8 Moved everything that can use EU and FE to using joules as an internal storage unit 2018-04-06 17:29:26 +02:00
malte0811 92a114d29d Proper bounding boxes for mech MB parts 
Added the missing bits of axle at the ends of the MB
Added a versioning NBT tag to the mech MB to allow easy changing of the MB structure
 2018-04-04 20:47:44 +02:00
malte0811 b913e28271 Updated copyright to 2018 2018-02-28 21:06:33 +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 6c60b4562b Merge branch 'MC1.12' into mechStuff 2018-02-01 20:56:12 +01:00
malte0811 93fb75a0b0 Adapted to the changes in wiring code for the next IE release 2018-01-30 21:59:09 +01:00
malte0811 58692ceb76 TMP commit 2018-01-01 20:07:20 +01:00
malte0811 14fde279be Added a command to make taking screenshots of Marx generator discharges easier/possible 2017-11-26 13:52:52 +01:00
malte0811 09161bce5f Added a seven-segment display for control panels 2017-10-31 16:29:38 +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 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 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 ccc3c7ab12 IC2 is an optional dependency now, probably still buggy 
Fix the TE names
 2017-08-22 18:33:05 +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 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 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 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