Commit graph

131 commits

Author SHA1 Message Date
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
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
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
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
malte0811
fdacf4129f Don't interact with other TE's in onChunkUnload, closes #12
(Ported from 1.11)
2017-08-14 17:38:33 +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
ea2355de28 Fix lighted buttons and toggle switches resetting on chunk reloads 2017-08-10 21:58:05 +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
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
5911b6a49e Build 1.5-15
Fixed an issue with control panels on servers
2017-07-13 18:13:06 +02:00
malte0811
74c0115102 Added documentation on the key ring and fixed some bugs with it 2017-07-13 17:53:05 +02:00
malte0811
304c5e50a6 Added documentation on single-component panels 2017-07-13 17:14:37 +02:00