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
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
malte0811
1def161870
Single-component panels are complete, just docs and probably bugfixes to do
2017-07-13 09:23:41 +02:00
malte0811
92b00f199c
Started adding single-component panel blocks. Very WIP
2017-07-12 20:20:11 +02:00
malte0811
2d06c96e46
Build 1.5-14
2017-07-10 21:13:37 +02:00
malte0811
107196ed1b
One more fix for connecting panels using connectors after the panel and the controller have been placed
2017-07-10 20:50:16 +02:00
malte0811
6f6edab7b1
IW's items show up in the creative search now
...
Coil length crafting now leaves the correct coil behind if the length is over the maximum
2017-07-10 20:30:18 +02:00
malte0811
9ee44021bc
Update to 1.12: Recipes
...
The recipe book is quite inconsistent about NBT...
2017-07-10 17:59:43 +02:00
malte0811
d0472b45b9
Update to 1.12: Everything except recipes done. Probably quite buggy
2017-07-09 18:10:06 +02:00
malte0811
f97bec3d44
Fixed changelog formatting
2017-07-04 18:17:27 +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
292c150466
Possibly improved transformation performance, closes #10
2017-07-03 21:08:39 +02:00
malte0811
f8f2de930e
Fixed panels not updating when a connection via panel connectors is broken or placed
2017-07-03 20:38:31 +02:00
malte0811
6a1081f47c
Fixed a CME when chunk rendering is multithreaded, see #10
2017-07-03 19:46:18 +02:00
malte0811
7dc33fb296
Finished up tilted panels:
...
-Some Bugfixes
-Added recipes and documentation
2017-07-02 20:37:47 +02:00
malte0811
b716c23e3d
Added a way to create tilted panels in-game (no recipe yet)
...
Panels are no longer created from machine casings, but from unfinished panels
2017-06-30 21:04:43 +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
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
5f8ef84e0f
Merge branch 'MC1.11' into marx
2017-06-23 17:33:13 +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