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
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
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
malte0811
d02981e14d
Added models for the RS panel connector
...
Fixed every block dropping the meta=0 version
2017-04-24 17:26:42 +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
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
malte0811
b1ff95cf85
Further work on control panels
...
RS output is working (but depends on current master IE with an additional fix)
Model rotation on Jacobs ladders is broken!
2017-03-28 18:15:41 +02:00
malte0811
34bf534b1c
started adding control panels. Very much WIP!
2017-03-24 17:40:05 +01:00
malte0811
b36e5c2623
General refactoring, IC2 connectors no longer use BlockIEBase!
2017-03-21 18:12:09 +01:00
malte0811
59177870f1
added the manual entry on jacobs ladders
...
fixed jacobs ladders replacing other blocks on placement
2017-03-03 19:04:08 +01:00
malte0811
a15107025d
Jacobs ladders cause damage when touched
...
applying salt to Jacobs ladder's colors the arc orange (due to sodium)
2017-03-03 17:52:22 +01:00
malte0811
7c9d8ff8fb
added textures for the jacobs ladders
...
fixed the normal sized ladder missing a bit of rendering
limited energy input to the side marked as such
2017-03-02 17:26:24 +01:00
malte0811
8a12144490
Progress on the jacobs ladders:
...
added models for the small and normal sized versions
made them rotatable
fixed sound
energy storage is saved to NBT now
2017-02-28 17:32:40 +01:00
malte0811
2edc831d19
added Jacobs Ladders, part 1
...
rendering and sound are done, as well as energy usage
ToDo: finish the dimensions of the different ladders, add models for small+normal, recipes, probably a lot more...
2017-02-26 14:04:23 +01:00
malte0811
3d9f199d66
Build 6
...
Potentially fixed missing textures/models on the mechanical converters in some cases?
Fixed "old" connectors with full storage not working
2017-01-11 16:40:54 +01:00
malte0811
0e613d05b8
reduced the difference between IC2's wires and IndustrialWires's cables to prevent machines from blowing up when they shouldn't
...
(There are still differences in some cases, but it works in most cases)
added a "credits" file
2017-01-04 18:31:56 +01:00
Sihen Zhang
52135edd44
Update zh_CN.lang
2016-12-24 11:24:45 +08:00
Sihen Zhang
09ec25e59d
Merge remote-tracking branch 'refs/remotes/malte0811/master'
2016-12-23 22:55:32 +08:00
Sihen Zhang
caa1c060ce
Create zh_CN.lang
2016-12-23 22:52:50 +08:00
malte0811
04e25e300c
made rotation work with mechanical converters
...
added recipes for the mechanical converters
changed them to accept forge energy as well as IF
2016-12-19 18:16:46 +01:00
malte0811
d3c571d60c
added textures for the mechanical converters+IF motor, made by C8H8O4
...
fixed some minor bugs with energy conversion rates
increased the default maximum of kinetic to rotational energy conversion, the old one was equal to about 2 IF
added a manual entry, still need to change the displayed recipes
2016-12-15 21:32:28 +01:00
malte0811
ba2bec5d95
Build 3:
...
reduced the amount of calls to BlockIEBase, I want to get stop using that class at some point
fixed missing localization for the creative tab
changed build.gradle to automatically download the latest version of IC2
2016-10-28 08:31:55 +02:00
malte0811
1fee68c9ef
changed wires to use different amounts of cable for different length connections
...
added Glass Fiber Wire
changed the amount of connectors/relays produced per crafting
WARNING: this commit won't work with the public IE builds currently available
2016-09-22 20:32:38 +02:00
malte0811
d8bbbb8170
initial commit
2016-09-16 16:47:59 +02:00
