malte0811 5667768420 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-07 22:03:07 +02:00
..
gui	Fixed GUI backgrounds not being darkened and item tooltips not showing in the Panel Creator GUI	2017-07-14 16:52:19 +02:00
panelmodel	Update to 1.12: Everything except recipes done. Probably quite buggy	2017-07-09 18:10:06 +02:00
render	Merge branch 'MC1.12' into marx	2017-08-07 22:03:07 +02:00
ClientEventHandler.java	Update to 1.12: Everything except recipes done. Probably quite buggy	2017-07-09 18:10:06 +02:00
ClientProxy.java	Merge branch 'MC1.12' into marx	2017-08-07 22:03:07 +02:00
RawQuad.java	Added a way to create tilted panels in-game (no recipe yet)	2017-06-30 21:04:43 +02:00