From 18ded5ca058e81b941f1d51a9f24b51f4cc70a6e Mon Sep 17 00:00:00 2001 From: Florexiz Date: Mon, 27 Sep 2021 17:59:33 +0300 Subject: Implemented limiting mode for input busses (same as in singleblocks) --- src/main/resources/assets/gregtech/lang/en_US.lang | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/resources/assets/gregtech/lang/en_US.lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index e173f9cfea..fba0af15df 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -72,6 +72,10 @@ GT5U.machines.voidoveflow.disabled=Overflow voiding disabled GT5U.hatch.disableFilter.true=Input Filter Off GT5U.hatch.disableFilter.false=Input Filter On +GT5U.hatch.disableSort.true=Sorting mode: OFF +GT5U.hatch.disableSort.false=Sorting mode: ON +GT5U.hatch.disableLimited.true=Limiting mode: OFF +GT5U.hatch.disableLimited.false=Limiting mode: ON GT5U.multiblock.pollution=Pollution reduced to GT5U.multiblock.energy=Stored Energy -- cgit From 92e0c77ea761ce4e2a2e75347c980f77fba9e3ca Mon Sep 17 00:00:00 2001 From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> Date: Sat, 30 Oct 2021 06:28:36 -0600 Subject: Clean up translations --- .../gregtech/common/items/GT_MetaGenerated_Item_98.java | 4 +--- src/main/resources/assets/gregtech/lang/en_US.lang | 14 ++++++++------ src/main/resources/assets/gregtech/lang/zh_CN.lang | 14 ++++++++------ 3 files changed, 17 insertions(+), 15 deletions(-) (limited to 'src/main/resources/assets/gregtech/lang/en_US.lang') diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java index 0a157f2e6d..b78d4e567b 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java @@ -68,6 +68,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { ESCHERICHIA_COLI_FLUID(11, "escherichiakolifluid", CellType.REGULAR), PENICILLIN(12, "penicillin", CellType.REGULAR), FLUORESCENT_DNA(13, "fluorecentddna", CellType.REGULAR), + POLYMERASE(17, "polymerase", CellType.REGULAR), // Good Generator COMBUSTION_PROMOTER(14, "combustionpromotor", CellType.REGULAR), @@ -83,9 +84,6 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { MUTAGEN(2, "mutagen", CellType.REGULAR), LIQUID_DNA(16, "liquiddna", CellType.REGULAR), - // Genetics - POLYMERASE(17, "polymerase", CellType.REGULAR), - // Tinker's Construct LIQUID_ENDER(3, "ender", CellType.REGULAR), diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index fba0af15df..423bbfde44 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -1112,21 +1112,23 @@ fluid.Ammonium Dinitramide=Ammonium Dinitramide fluid.LMP-103S=LMP-103S fluid.Nitromethane=Nitromethane fluid.O-Xylene=O-Xylene +//GT_MetaGenerated_Item_98 cells +fluid.UnknownNutrientAgar=Unknown Nutrient Agar +fluid.SeaweedBroth=Seaweed Broth +fluid.EnzymesSollution=Enzyme Solution +fluid.escherichiakolifluid=eColi Bacteria Fluid +fluid.Penicillin=Penicillin +fluid.FluorecentdDNA=Fluorescent DNA +fluid.Polymerase=Polymerase //No cell, most from bart bio fluid.Monomethylhydrazine=Monomethylhydrazine fluid.binnibacteriafluid=binnibacteriafluid -fluid.SeaweedBroth=SeaweedBroth fluid.barnadafisarboriatorisfluid=barnadafisarboriatorisfluid -fluid.Polymerase=Polymerase fluid.GelatinMixture=GelatinMixture -fluid.FluorecentdDNA=FluorecentdDNA -fluid.Penicillin=Penicillin fluid.sludge=sludge -fluid.EnzymesSollution=EnzymesSollution fluid.Formaldehyde=Formaldehyde fluid.tcetieisfucusserratusfluid=tcetieisfucusserratusfluid fluid.MeatExtract=MeatExtract -fluid.UnknownNutrientAgar=UnknownNutrientAgar //No recipe fluid.CompressedOxygen=CompressedOxygen fluid.CompressedNitrogen=CompressedNitrogen diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index 5d7ebab206..d9eb0e6b67 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -1104,21 +1104,23 @@ fluid.Ammonium Dinitramide=二硝酰胺铵 fluid.LMP-103S=LMP-103S fluid.Nitromethane=硝基甲烷 fluid.O-Xylene=邻二甲苯 +//GT_MetaGenerated_Item_98 cells +fluid.UnknownNutrientAgar=未知营养琼脂 +fluid.SeaweedBroth=海藻基质 +fluid.EnzymesSollution=酶溶液 +fluid.escherichiakolifluid=eColi Bacteria Fluid +fluid.Penicillin=青霉素 +fluid.FluorecentdDNA=荧光DNA +fluid.Polymerase=聚合酶 //以下流体没有单元形式，大部分是bart的生物科技 fluid.Monomethylhydrazine=一甲基肼 fluid.binnibacteriafluid=双杆菌液体 -fluid.SeaweedBroth=海藻基质 fluid.barnadafisarboriatorisfluid=巴纳德乔木培养液 -fluid.Polymerase=聚合酶 fluid.GelatinMixture=明胶混合物 -fluid.FluorecentdDNA=荧光DNA -fluid.Penicillin=青霉素 fluid.sludge=菌泥 -fluid.EnzymesSollution=酶溶液 fluid.Formaldehyde=甲醛 fluid.tcetieisfucusserratusfluid=鲸鱼座T星藻类培养液 fluid.MeatExtract=肉汁 -fluid.UnknownNutrientAgar=未知营养琼脂 //以下流体有贴图没有配方 fluid.CompressedOxygen=压缩氧气 fluid.CompressedNitrogen=压缩氮气 -- cgit From 6e769a3f6139924067516682ade3b2699b05c76c Mon Sep 17 00:00:00 2001 From: Raphael Date: Sat, 6 Nov 2021 19:54:20 +0800 Subject: Move the missing key of creative tab from Gregtech.lang to resources --- src/main/resources/assets/gregtech/lang/en_US.lang | 11 +++++++++++ src/main/resources/assets/gregtech/lang/zh_CN.lang | 11 +++++++++++ 2 files changed, 22 insertions(+) (limited to 'src/main/resources/assets/gregtech/lang/en_US.lang') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 423bbfde44..7aab353061 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -1,3 +1,14 @@ +# Creative ItemGroup Tab +itemGroup.GregTech.GTPP_BLOCKS=GT++ Blocks +itemGroup.GregTech.GTPP_MACHINES=GT++ Machines +itemGroup.GregTech.GTPP_MISC=GT++ Misc +itemGroup.GregTech.GTPP_OTHER=GT++ Other +itemGroup.GregTech.GTPP_OTHER_2=GT++ Other II +itemGroup.GregTech.GTPP_TOOLS=GT++ Tools +itemGroup.GregTech.Main=Main +itemGroup.GregTech.Materials=Materials +itemGroup.GregTech.Ores=Ores + # Multiblock Tooltip Builder Keywords # Context can be found in the class gregtech.api.util.GT_Multiblock_Tooltip_Builder GT5U.MBTT.MachineType=Machine Type diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index ad862e021b..d179aeb707 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -1,3 +1,14 @@ +# Creative ItemGroup Tab +itemGroup.GregTech.GTPP_BLOCKS=GT++方块 +itemGroup.GregTech.GTPP_MACHINES=GT++机器 +itemGroup.GregTech.GTPP_MISC=GT++杂项 +itemGroup.GregTech.GTPP_OTHER=GT++其他 +itemGroup.GregTech.GTPP_OTHER_2=GT++其他II +itemGroup.GregTech.GTPP_TOOLS=GT++工具 +itemGroup.GregTech.Main=主体 +itemGroup.GregTech.Materials=材料 +itemGroup.GregTech.Ores=矿石 + # Multiblock Tooltip Builder Keywords # Context can be found in the class gregtech.api.util.GT_Multiblock_Tooltip_Builder GT5U.MBTT.MachineType=机器类型 -- cgit