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
..
MessageGUIInteract.java	Glowing components like the indicator light actuall glow in the dark now	2017-05-11 16:39:20 +02:00
MessageItemSync.java	Started adding locks for panels	2017-05-18 18:13:08 +02:00
MessagePanelInteract.java	Updated mappings to match the ones used by IE	2017-06-25 18:34:10 +02:00
MessageTileSyncIW.java	Added a render for the Marx generator	2017-06-02 17:57:17 +02:00