Commit Graph

254 Commits

Author SHA1 Message Date
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