Merge remote-tracking branch 'remotes/origin/mc1710' into forestry_unstable

This commit is contained in:
bdew committed 2015-09-29 12:33:34 +03:00
commit ff39ddae92
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
gendustry.version=1.6.0
gendustry.version=1.6.1
gendustry.api.version=2.2.0
curseforge.id=70492
@@ -25,7 +25,7 @@ class GuiMutatronAdv(val te: TileMutatronAdv, player: EntityPlayer) extends Base
widgets.add(new WidgetPowerCustom(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
widgets.add(new WidgetFluidGauge(new Rect(32, 19, 16, 58), Textures.tankOverlay, te.tank))
widgets.add(new WidgetSelector(new Point(7, 84), te.selectedMutation, -1))
widgets.add(new WidgetLabel(Misc.toLocal("tile.gendustry.mutatron.adv.name"), 8, 6, Color.darkGray))
widgets.add(new WidgetLabel(Misc.toLocal("tile.gendustry.mutatron_adv.name"), 8, 6, Color.darkGray))
widgets.add(new WidgetLabel(Misc.toLocal("gendustry.label.select"), 8, 89, Color.darkGray))
inventorySlots.getSlotFromInventory(te, te.slots.inIndividual1).setBackgroundIcon(HintIcons.queenOrSapling)
@@ -24,6 +24,6 @@ class GuiMutagenProducer(val te: TileMutagenProducer, player: EntityPlayer) exte
widgets.add(new WidgetProgressBarNEI(new Rect(79, 41, 53, 15), Textures.greenProgress(53), te.progress, "MutagenProducer"))
widgets.add(new WidgetPowerCustom(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
widgets.add(new WidgetFluidGauge(new Rect(152, 19, 16, 58), Textures.tankOverlay, te.tank))
widgets.add(new WidgetLabel(Misc.toLocal("tile.gendustry.mutagen.producer.name"), 8, 6, Color.darkGray))
widgets.add(new WidgetLabel(Misc.toLocal("tile.gendustry.mutagen_producer.name"), 8, 6, Color.darkGray))
}
}