Merge branch 'master' of https://github.com/GTNewHorizons/GT5-Unofficial

2 files changed, 16 insertions, 2 deletions

diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 23626458f1..3e37d7db3b 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -2772,8 +2772,8 @@ public class GT_MachineRecipeLoader implements Runnable {
 
         GT_Values.RA.addChemicalRecipe(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2), Materials.NitricAcid.getFluid(1000), GT_Values.NF, Materials.Saltpeter.getDust(1), 100, 30);
 
-		GT_Values.RA.addMixerRecipe(Materials.Salt.getDust(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(1000), Materials.SaltWater.getFluid(2000), GT_Values.NI, 40, 8);
-		GT_Values.RA.addDistilleryRecipe(1, Materials.SaltWater.getFluid(2000), GT_ModHandler.getDistilledWater(1000), Materials.Salt.getDust(1), 3200, 16, false);
+		GT_Values.RA.addMixerRecipe(Materials.Salt.getDust(1), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Water.getFluid(1000), Materials.SaltWater.getFluid(1000), GT_Values.NI, 100, 8);
+		GT_Values.RA.addDistilleryRecipe(1, Materials.SaltWater.getFluid(1000), GT_ModHandler.getDistilledWater(1000), Materials.Salt.getDust(1), 1600, 30, false);
 
         GT_Values.RA.addUniversalDistillationRecipe(FluidRegistry.getFluidStack("potion.vinegar", 40), new FluidStack[]{Materials.AceticAcid.getFluid(5), Materials.Water.getFluid(35)}, GT_Values.NI, 20, 64);
         GT_Values.RA.addMixerRecipe(Materials.Calcite.getDust(1),        GT_Utility.getIntegratedCircuit(1),  GT_Values.NI, GT_Values.NI, Materials.AceticAcid.getFluid(2000), Materials.CalciumAcetateSolution.getFluid(1000), GT_Values.NI, 240, 16);
diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang
index d179aeb707..0c8f9264bd 100644
--- a/src/main/resources/assets/gregtech/lang/zh_CN.lang
+++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang
@@ -80,9 +80,22 @@ GT5U.machines.oilfluidpump=石油/流体钻机
 GT5U.machines.minermulti=采矿场
 GT5U.machines.voidoveflow.enabled=启用溢出销毁
 GT5U.machines.voidoveflow.disabled=禁用溢出销毁
+GT5U.machines.select_circuit=选择机器模式
+
+GT5U.gui.select.current=当前：
+
+GT5U.item.programmed_circuit.select.header=再编程电路
+# Note to translators: this translation entry is supposed to be a number indicating how many taunts you define here
+# Game will randomly display one of them
+GT5U.item.programmed_circuit.no_screwdriver.count=3
+GT5U.item.programmed_circuit.no_screwdriver.0=想要再空手编程电路板,嗯哼?
+GT5U.item.programmed_circuit.no_screwdriver.1=你的拇指不是螺丝刀.拿个真的过来.
+GT5U.item.programmed_circuit.no_screwdriver.2=Chuck Norris可以盯着电路板,然后电路板就自己再编程了. 但你不行.
 
 GT5U.hatch.disableFilter.true=关闭输入过滤
 GT5U.hatch.disableFilter.false=开启输入过滤
+GT5U.hatch.disableMultiStack.true=关闭多组输入
+GT5U.hatch.disableMultiStack.false=开启多组输入
 GT5U.hatch.disableSort.true=关闭整理模式
 GT5U.hatch.disableSort.false=开启整理模式
 GT5U.hatch.disableLimited.true=关闭限制模式
@@ -963,6 +976,7 @@ for.bees.species.steel=钢铁
 for.bees.species.nickel=镍
 for.bees.species.zinc=锌
 for.bees.species.silver=银
+for.bees.species.cryolite=冰晶石
 for.bees.species.gold=金
 for.bees.species.sulfur=硫
 for.bees.species.gallium=镓