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
..
industrialWires	Merge branch 'MC1.12' into marx	2017-08-06 18:15:08 +02:00