Commit graph

82 commits

Author SHA1 Message Date
22ebc12fc8 Added Magneticraft and Gregtech support
Some checks failed
continuous-integration/drone Build is failing
2020-04-09 23:52:49 +02:00
7b056c057d build 37 2020-03-20 22:17:02 +01:00
77b3fb454e build.gradle fix 2020-03-20 22:14:53 +01:00
malte0811
9ea0b355a5 Build 1.7-36 2019-01-25 18:44:26 +01:00
malte0811
7c62332b57 Build 1.7-35 2019-01-15 08:32:08 +01:00
malte0811
e9a8225f77 Build 1.7-34 2019-01-12 21:09:16 +01:00
malte0811
c6d2a26a6d The resistor wires are returned when the marx generator is disassembled now, closes #62 2019-01-12 11:37:16 +01:00
malte0811
961b325111 Build 1.7-33 2018-12-02 12:58:44 +01:00
malte0811
208fc0611e Build 1.7-32 2018-11-18 18:05:38 +01:00
malte0811
88c10cdb81 Switch to the new data-driven connector models
Update to new mappings
2018-11-17 12:23:31 +01:00
malte0811
a60b55cad1 Build 1.7-31 2018-09-07 23:59:43 +02:00
malte0811
51e139b568 Build 1.7-30 2018-09-03 21:15:33 +02:00
malte0811
a9a481c1cf Build 1.7-29 2018-08-25 17:59:06 +02:00
malte0811
1c24abda2c The wires now work with both FE and EU, but not at the same time 2018-08-11 20:58:58 +02:00
malte0811
f48d277280 Build 1.7-28 2018-08-05 22:19:41 +02:00
malte0811
d548bd5cf3 Updated the manual entry on RS control panel interaction 2018-08-05 22:01:13 +02:00
malte0811
4fef9f6a04 Added Charset compat to the redstone controller
TODO recipe
2018-08-05 16:49:55 +02:00
malte0811
fc2e9dca4d Initial version of a redstone controller for Project:Red bundled cables (no texture, localization, probably crashes without P:R) 2018-08-01 17:29:24 +02:00
malte0811
0a67837965 Build 1.7-27 2018-07-16 20:05:48 +02:00
malte0811
dca94087a2 Added an update checker (Forge JSON) 2018-07-16 19:53:20 +02:00
malte0811
71716a722e Build 1.7-26
Some fixes
2018-06-27 22:49:20 +02:00
malte0811
880d350720 Misc fixes for the mechanical multiblocks 2018-06-22 18:51:51 +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
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