Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-30 00:47:54 +00:00
commit 62e7cc8f65
54 files changed
+992 -344

No files matched your search

@@ -60,7 +60,7 @@ public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, Pres
configComponent.addOutput(TransmissionType.GAS, new SideData("Output", EnumColor.DARK_BLUE, new int[] {2}));
configComponent.setConfig(TransmissionType.GAS, new byte[] {0, 0, 0, 0, 1, 2});
configComponent.setInputEnergyConfig();
configComponent.setInputConfig(TransmissionType.ENERGY);
inventory = new ItemStack[4];