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

243 commits

Author SHA1 Message Date
malte0811 71716a722e Build 1.7-26 
Some fixes
 2018-06-27 22:49:20 +02:00
malte0811 16c01a8049 Some bugfixes for the small converters 2018-06-27 21:06:03 +02:00
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 311a498a90 Finished the separated energy inputs/outputs. Textures will need to change since they get blocked by most pipes/connectors 2018-06-16 23:08:38 +02:00
malte0811 3d2865aa93 Basic separated energy inputs/outputs for MechMB's 2018-06-16 19:15:15 +02:00
malte0811 5364b14f5b Some misc fixes 
I may have to move to seperate inputs/outputs
 2018-06-15 21:11:25 +02:00
malte0811 375c30d139 Some cleanup, fixed another issue along the lines of #28 2018-06-15 16:15:06 +02:00
malte0811 e377b77819 Fixed issues with energy loops through wires outside of mechanical multiblocks 2018-06-15 09:35:14 +02:00
malte0811 2b9ec80253 Not just the master block should be able to interact with the IC2 energy net 2018-06-14 22:01:39 +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 781ed3d773 Mechanical multiblock examples look mostly right when used with the IP projector 2018-06-08 21:11:06 +02:00
malte0811 bf8ea992b8 Fix some issues with wire energy loss, closes #28 
Fix a crash on startup with IP since it makes assumptions about multiblocks
 2018-06-08 20:56:17 +02:00
malte0811 8c16f44970 Fixed some UV's, minor changes to the Marx generator texture 2018-06-05 20:26:44 +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 b65cdc6fbe General cleanup 2018-05-26 18:46:40 +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 d5b537ea98 Misc cleanup, removed some comments on things I won't implement (for now) 2018-05-14 19:07:52 +02:00
malte0811 a756de6ace Pick block works on mechanical multiblocks now 
Fix crashes without IC2
 2018-05-14 18:51:42 +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 1959b93f5b Fixed some potential CME's 
IC2 feedthrough connectors properly disassemble now
 2018-04-06 18:25:46 +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 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 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 87f4dc8f93 More work 
Changed waveform system to be more usable in code
Added some max speeds
 2018-03-24 17:45:25 +01: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 b913e28271 Updated copyright to 2018 2018-02-28 21:06:33 +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 c3570a1273 Build 1.6-25 2018-02-19 18:11:45 +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 b87b67b17f Fixed the redstone wire controller not connecting to RS wires 2018-02-09 21:17:14 +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 93fb75a0b0 Adapted to the changes in wiring code for the next IE release 2018-01-30 21:59:09 +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 534f844d0e Build 1.6-24 
Changed the default maximum conversion amounts
 2018-01-09 18:26:34 +01:00
malte0811 b09745a320 Fixed infinite kinetic energy being produced, closes #22 2018-01-09 17:55:25 +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 8ff35f0ea4 Revert to the old buffer handling, reopens #18 2017-12-08 19:55:02 +01:00
malte0811 37233621bf Fixed things blowing up (see last commit), closes #18 2017-12-08 19:29:57 +01:00
malte0811 5b50013f68 Limit the connector buffer to the input power, see #18 
This currently causes things to blow up for non-obvious reasons when cables are involved
 2017-12-08 18:30:53 +01:00
malte0811 15cf1010aa Added a recipe for seven-segment displays 2017-12-08 17:17:15 +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 afccf9b677 Coil length crafting works again, see #19 2017-11-26 13:37:34 +01:00
malte0811 2df8bc4f29 Build 1.6-22 
Stop using JavaFX vectors as they don't seem to exist in a normal instance
 2017-10-31 17:16:25 +01:00
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 6000203141 Fixed panel component raytracing sorting 
Components can no longer be activated through the back of the panel
 2017-10-28 18:53:21 +02:00
malte0811 543368ad7c Fixed crashes with 2-channel components where the second id is selected, but not the channel 2017-10-27 21:08:17 +02:00
malte0811 a35150f8e7 Possibly fixed a weird crash when placing control panels? 2017-10-27 18:52:08 +02:00
malte0811 f4884d23ba Build 1.6-21 
Updated README.md+screenshot
Fixed the Marx generator not charging properly off an EU supply
Fixed the IE version detection. Stupid Java optimized out the field access to the version String since it's static final
 2017-10-22 20:02:41 +02: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 1b9bd041b0 Minor cleanup of the Marx generator disassembly code 2017-10-20 18:59:27 +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 a4de0c800d Fixed issues with block breaking (Marx generator) 2017-10-10 18:42:44 +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 f33650280e Fixed a race condition with Marx generator discharges (probably, as usual with race conditions) 2017-10-08 18:39:15 +02:00
malte0811 ab77d28bc9 Fixed invisible wires on dedicated servers 2017-10-07 18:51:28 +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 67562ef296 Remove TE's that don't need to tick from the ticking TE list 
Use IE uranium if IC2 isn't installed
 2017-09-13 21:32:19 +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 a732ffa6a9 Remove manual entries if IC2 isn't loaded 2017-09-02 18:03:16 +02:00
malte0811 2b3bad1149 Add signing info 2017-09-02 17:20:57 +02:00
malte0811 e5e400a1fa TR doesn't need special wires 2017-09-01 21:13:23 +02:00
malte0811 685a9058f6 Allow CT to remove marx recipes 2017-08-29 22:01:51 +02:00
malte0811 bc1ebc9fa5 Add JEI support for the Marx generator 2017-08-29 21:31:22 +02:00
malte0811 96aa3ec96a Add CraftTweaker support for the Marx generator 2017-08-27 22:45:52 +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 2f609e9026 Add a second RS channel for each voltage signal to allow precise control 2017-08-16 21:15:26 +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 2b2f5ca6c1 Replace the ore-specific energy values with one global constant, to make it possible to determine the constant with cheap ores 
Fix a crash when interacting with the top/bottom side of a HV capacitor
 2017-08-14 21:56:44 +02:00
malte0811 bf74920482 Update changelog and contributing guidelines 2017-08-14 18:25:12 +02:00