Commit graph

21 commits

Author SHA1 Message Date
malte0811
78bc37771a Fixed labels breaking the model cache and on dedicated servers, closes #10
(back-port from 1.11)
2017-08-04 18:51:26 +02:00
malte0811
6c66ce648a Fixed panels not updating when a connection via panel connectors is broken or placed
(back-port from 1.11)
2017-08-04 18:47:20 +02:00
malte0811
7a5edfa825 Fixed a CME when chunk rendering is multithreaded, see #10
(back-port from 1.11)
2017-08-04 18:41:47 +02:00
malte0811
b1a1b4e62a Allowed multiple components on the same panel network to modify the same RS signal
Cleaned up RS output code for panel components
(Back-port from 1.11)
2017-08-04 18:37:03 +02:00
malte0811
6c6a72ae03 Minor fixes to the previous commits 2017-05-26 17:02:07 +02:00
malte0811
65ba8acbec 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-26 13:33:24 +02:00
malte0811
b11ca376a3 Fixes for the previous commits 2017-05-26 13:26:15 +02:00
malte0811
55e03ab8a4 Started adding locks for panels
# Conflicts:
#	src/main/java/malte0811/industrialWires/CommonProxy.java
#	src/main/java/malte0811/industrialWires/IndustrialWires.java
#	src/main/java/malte0811/industrialWires/client/ClientProxy.java
#	src/main/java/malte0811/industrialWires/containers/ContainerPanelComponent.java
#	src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java
#	src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java
#	src/main/java/malte0811/industrialWires/network/MessageComponentSync.java
2017-05-26 13:25:16 +02:00
malte0811
0c52514b15 Glowing components like the indicator light actuall glow in the dark now
Some bugfixes
Complete code reformatting

(Cherry-picked)

# Conflicts:
#	src/main/java/malte0811/industrialWires/IndustrialWires.java
#	src/main/java/malte0811/industrialWires/blocks/BlockIWBase.java
#	src/main/java/malte0811/industrialWires/blocks/EnergyAdapter.java
#	src/main/java/malte0811/industrialWires/blocks/ItemBlockIW.java
#	src/main/java/malte0811/industrialWires/blocks/TileEntityJacobsLadder.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/BlockPanel.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanel.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanelCreator.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java
#	src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalConverter.java
#	src/main/java/malte0811/industrialWires/blocks/converter/TileEntityIEMotor.java
#	src/main/java/malte0811/industrialWires/blocks/converter/TileEntityMechICtoIE.java
#	src/main/java/malte0811/industrialWires/blocks/converter/TileEntityMechIEtoIC.java
#	src/main/java/malte0811/industrialWires/blocks/wire/BlockIC2Connector.java
#	src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java
#	src/main/java/malte0811/industrialWires/client/ClientEventHandler.java
#	src/main/java/malte0811/industrialWires/client/gui/GuiPanelComponent.java
#	src/main/java/malte0811/industrialWires/client/gui/GuiPanelCreator.java
#	src/main/java/malte0811/industrialWires/client/gui/elements/GuiIntChooser.java
#	src/main/java/malte0811/industrialWires/containers/ContainerPanelCreator.java
#	src/main/java/malte0811/industrialWires/containers/ContainerRSPanelConn.java
#	src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java
#	src/main/java/malte0811/industrialWires/controlpanel/LightedButton.java
#	src/main/java/malte0811/industrialWires/controlpanel/PanelComponent.java
#	src/main/java/malte0811/industrialWires/controlpanel/PanelUtils.java
#	src/main/java/malte0811/industrialWires/controlpanel/Slider.java
#	src/main/java/malte0811/industrialWires/crafting/RecipeCoilLength.java
#	src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java
#	src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java
#	src/main/java/malte0811/industrialWires/network/MessageGUIInteract.java
#	src/main/java/malte0811/industrialWires/network/MessagePanelInteract.java
#	src/main/java/malte0811/industrialWires/util/MiscUtils.java
2017-05-26 13:11:15 +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
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
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
malte0811
3739fc127c Stopped the user from placing overlapping components
Fixed GUI String rendering size
Fixed panel components not stacking in some situations
Slider length has to be greater than 0.125 now
2017-04-23 17:23:10 +02:00
malte0811
0327322198 Added editing GUI's for the other components
fixed a potential component dupe bug
2017-04-22 18:14:49 +02:00
malte0811
1d83fa7579 Added a GUI for editing panel components
Currently only available for buttons
2017-04-20 20:44:08 +02:00
malte0811
8cabaa9844 Added textures for the panel creator GUI and the control panel block
Fixed bounding box direction on the Jacob's ladders
2017-04-17 19:35:14 +02:00
malte0811
0ee914b7e6 Further work on panel creation
Added items to represent the panel components
2017-04-13 17:14:05 +02:00