Merge pull request #133 from KorDum/feature/localization

[1.7.10] Fixed missed fluid localization
This commit is contained in:
Alexander Kornilov authored and GitHub committed 2017-06-18 13:32:23 +03:00
commit bd1e357e40
12 files changed
+18 -19

No files matched your search

@@ -133,7 +133,8 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
public boolean isLiquidValidForTank(FluidStack liquid, int tank) {
TankSlot slot = getTankSlot(tank);
return slot != null
&& (slot.isValid(liquid) && !slot.isReadOnly());
&& slot.isValid(liquid)
&& !slot.isReadOnly();
}
@Override
@@ -46,7 +46,7 @@ public enum GeneticLiquid implements IFluidType {
@Override
public String getName() {
return I18N.localise("fluid." + name);
return I18N.localise("fluid.binnie." + name);
}
@Override
@@ -10,4 +10,5 @@ public class Genepool {
public static final int TIME_PERIOD = 400;
public static final float ENZYME_PER_PROCESS = 0.25f;
public static final float ETHANOL_PER_PROCESS = 50.0f;
public static final int POWER_CAPACITY = 1600;
}
@@ -53,7 +53,7 @@ public class GenepoolPackage extends PackageGeneticBase implements IMachineInfor
ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine);
transfer.addRestock(Genepool.SLOT_RESERVE, Genepool.SLOT_BEE, 1);
new ComponentPowerReceptor(machine, 1600);
new ComponentPowerReceptor(machine, Genepool.POWER_CAPACITY);
new GenepoolComponentLogic(machine);
ComponentChargedSlots chargedSlots = new ComponentChargedSlots(machine);
chargedSlots.addCharge(Genepool.SLOT_ENZYME);
@@ -13,6 +13,6 @@ class DnaValidator extends Validator<FluidStack> {
@Override
public String getTooltip() {
return I18N.localise("fluid.rawDNA");
return I18N.localise("fluid.binnie.dna.raw");
}
}
@@ -13,6 +13,6 @@ class PolymerisingBacteriaValidator extends Validator<FluidStack> {
@Override
public String getTooltip() {
return I18N.localise("fluid.bacteriaPoly");
return I18N.localise("fluid.binnie.bacteriaPoly");
}
}
@@ -182,7 +182,6 @@ extrabees.block.hive.3=Marble Hive
extrabees.acid=Acid
extrabees.poison=Poison
extrabees.glacial=Liquid Nitrogen
fluid.dna.raw=Liquid DNA
##################################################
@@ -182,7 +182,6 @@ extrabees.block.hive.3=Мраморный улей
extrabees.acid=Растворитель
extrabees.poison=Яд
extrabees.glacial=Нитроген
fluid.dna.raw=Сырая ДНК
##################################################
@@ -178,7 +178,6 @@ extrabees.block.hive.3=大理石蜂巢
extrabees.acid=酸
extrabees.poison=毒液
extrabees.glacial=液氮
fluid.dna.raw=液态DNA
##################################################
@@ -1,8 +1,8 @@
fluid.rawDNA=Raw DNA
fluid.bacteria=Bacteria
fluid.bacteriaPoly=Polymerizing Bacteria
fluid.growthMedium=Growth Medium
fluid.bacteriaVector=Bacteria Vector
fluid.binnie.dna.raw=Liquid DNA
fluid.binnie.bacteria=Bacteria
fluid.binnie.growthMedium=Growth Medium
fluid.binnie.bacteriaPoly=Polymerizing Bacteria
fluid.binnie.bacteriaVector=Bacteria Vector
genetics.item.casingIron.name=Reinforced Casing
genetics.item.dnaDye.name=DNA Dye
@@ -1,8 +1,8 @@
fluid.rawDNA=Сырая ДНК
fluid.bacteria=Бактерия
fluid.bacteriaPoly=Полимеризированная бактерия
fluid.growthMedium=Питательная среда
fluid.bacteriaVector=Бактерия Вектор
fluid.binnie.dna.raw=Сырая ДНК
fluid.binnie.bacteria=Бактерия
fluid.binnie.bacteriaPoly=Полимеризированная бактерия
fluid.binnie.growthMedium=Питательная среда
fluid.binnie.bacteriaVector=Бактерия Вектор
genetics.item.casingIron.name=Укреплённый корпус
genetics.item.dnaDye.name=Краситель ДНК
@@ -1,4 +1,4 @@
fluid.rawDNA=原生 DNA
fluid.binnie.dna.raw=原生 DNA
genetics.item.casingIron.name=强化外壳
genetics.item.dnaDye.name=DNA Dye