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
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
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
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
206c1170f1
Merge branch 'MC1.11' into marx
2017-06-05 17:23:18 +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
malte0811
b9f5a8a9f8
Added (analog) panel meters
...
Fixed locks breaking the model cache
Ported the fix for #7
2017-05-27 17:02:18 +02:00
malte0811
8e845ab100
Added a key ring, holds up to 10 keys by default
...
texture might change, docs+recipe still to do
2017-05-20 18:50:04 +02:00
malte0811
695679caa2
Added textures for the key+lock switch
...
Renaming a key to an empty name returns it to its unnamed state
2017-05-20 17:14:43 +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
5165d55218
Started adding locks for panels
2017-05-18 18:13:08 +02:00
malte0811
d3cd816f0c
Added some IC2 items to the Engineer's toolbox
2017-05-15 21:40:43 +02:00
malte0811
6d4c4f7276
Added a remapper to stop wire connectors from vanishing when updating
...
They will be facing north though, so most of them will have to be broken and replaced
2017-05-13 20:13:40 +02:00
malte0811
23c1afc44b
Glowing components like the indicator light actuall glow in the dark now
...
Some bugfixes
Complete code reformatting
2017-05-11 16:39:20 +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
aca048cbee
Added recipes for all panel related things
...
Apart from the missing textures everything is ready for a release
2017-05-09 17:25:03 +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
bf66a0fdc7
Added a variable transformer/Variac to put on control panels
2017-05-03 18:08:52 +02:00
malte0811
4586e57b84
Control panels can be disassembled in the panel creator now
...
added the missing background textures
changed the "base item" for control panels to be a basic machine casing
2017-05-01 18:40:29 +02:00
malte0811
6717e7c815
Added a model for the panel creator
2017-04-29 18:54:21 +02:00
malte0811
4e84a0d020
Added an item model for the control panel
...
Added some localization&other item models
2017-04-28 20:20:52 +02:00
malte0811
c15e68a716
Added textures for the panel component items
...
Made it possible to pick up single components from the panel creator GUI
2017-04-27 18:15:11 +02:00
