Commit graph

23 commits

Author SHA1 Message Date
malte0811
58692ceb76 TMP commit 2018-01-01 20:07:20 +01: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
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
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
2f609e9026 Add a second RS channel for each voltage signal to allow precise control 2017-08-16 21:15:26 +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
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
d68eb801c3 Started implementing ore processing 2017-06-25 18:00:48 +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
d65621a0b5 Redstone control, other misc Marx generator details 2017-06-09 11:37:23 +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