Merge branch 'development' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-04-29 16:52:22 +01:00
commit 2e2f4ce390
27 files changed
+228 -159

No files matched your search

@@ -64,7 +64,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
{
super("GasTank");
configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.GAS);
configComponent = new TileComponentConfig(this, TransmissionType.GAS, TransmissionType.ITEM);
configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
configComponent.addOutput(TransmissionType.ITEM, new SideData("Fill", EnumColor.DARK_BLUE, new int[] {0}));