Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9

This commit is contained in:
modmuss50 2016-03-16 17:09:34 +00:00
commit e319398bc9
17 changed files with 272 additions and 11 deletions

View file

@ -39,7 +39,7 @@ public class ItemParts extends ItemTextureBase {
"thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell",
"quadPlutoniumCell", "destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor"
, "machineParts", "thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit"
, "rubberSap", "rubber", "scrap", "pump", "teleporter", "advancedAlloy", "lvTransformer", "mvTransformer", "hvTransformer"};
, "rubberSap", "rubber", "scrap", "pump", "teleporter", "advancedAlloy"};
public ItemParts() {