Commit graph

59 commits

Author SHA1 Message Date
malte0811 8c16f44970 Fixed some UV's, minor changes to the Marx generator texture 2018-06-05 20:26:44 +02:00
malte0811 b65cdc6fbe General cleanup 2018-05-26 18:46:40 +02:00
malte0811 a756de6ace Pick block works on mechanical multiblocks now
Fix crashes without IC2
2018-05-14 18:51:42 +02:00
malte0811 eb7f73464f Misc fixes, mostly related to sound and the "broken parts" entities 2018-05-12 19:04:38 +02: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 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 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 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 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 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 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 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 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 8d4c0fcad2 Merge branch 'marx' into MC1.12 2017-09-04 17:42:50 +02:00
malte0811 2b3bad1149 Add signing info 2017-09-02 17:20:57 +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 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 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 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 1a304e169e Fixed GUI backgrounds not being darkened and item tooltips not showing in the Panel Creator GUI 2017-07-14 16:52:19 +02:00
malte0811 2d06c96e46 Build 1.5-14 2017-07-10 21:13:37 +02:00
malte0811 d0472b45b9 Update to 1.12: Everything except recipes done. Probably quite buggy 2017-07-09 18:10:06 +02:00
malte0811 0a772758ae Build 1.5-13
Fixed labels breaking the model cache and on dedicated servers, closes #10
2017-07-04 18:16:13 +02:00
malte0811 b6ef962f6f Build 1.5-12 2017-07-03 21:33:59 +02:00
malte0811 15674f7ae3 Added tilted panels. Currently they can only be created by editing the panels NBT data 2017-06-28 21:41:50 +02:00
malte0811 cbac269e04 Updated mappings to match the ones used by IE 2017-06-25 18:34:10 +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 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 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 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 7cc0d9d9fe Added toggle switches, including a version with a cover to prevent accidental activation 2017-05-08 17:20:04 +02:00
malte0811 ee827b46ef Started implementing a GUI for creating control panels
fixed the default value for euPerIf, closes #6
2017-04-12 15:55:37 +02:00
malte0811 3d4c2ef1f4 Added sliders to control panels, they can be used to set an RS signal between 0 and 15
Commented out the IE gradle dependency since no maven build of IE works with control panels yet (latest master does though)
2017-04-04 17:11:50 +02:00
malte0811 b36e5c2623 General refactoring, IC2 connectors no longer use BlockIEBase! 2017-03-21 18:12:09 +01:00
malte0811 c3d871aa37 Build 7
fixed the Jacob's Ladders breaking when trying to rotate them
fixed sharp rendering edges inside "salted" arcs
2017-03-06 16:47:16 +01:00