diff options
9 files changed, 257 insertions, 21 deletions
diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java index 547da44050..76a24e8802 100644 --- a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java +++ b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java @@ -5,6 +5,7 @@ import gregtech.api.GregTech_API; import gregtech.api.graphs.consumers.*; import gregtech.api.graphs.paths.NodePath; import gregtech.api.graphs.paths.PowerNodePath; +import gregtech.api.interfaces.tileentity.IEnergyConnected; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.metatileentity.MetaPipeEntity; @@ -50,8 +51,16 @@ public class GenerateNodeMapPower extends GenerateNodeMap { protected boolean addConsumer(TileEntity aTileEntity, byte aSide, int aNodeValue, ArrayList<ConsumerNode> aConsumers) { if (aTileEntity instanceof BaseMetaTileEntity) { BaseMetaTileEntity tBaseTileEntity = (BaseMetaTileEntity) aTileEntity; - if (tBaseTileEntity.inputEnergyFrom(aSide,false)) { - ConsumerNode tConsumerNode = new NodeGTBaseMetaTile(aNodeValue,tBaseTileEntity, aSide, aConsumers); + if (tBaseTileEntity.inputEnergyFrom(aSide, false)) { + ConsumerNode tConsumerNode = new NodeGTBaseMetaTile(aNodeValue, tBaseTileEntity, aSide, aConsumers); + aConsumers.add(tConsumerNode); + return true; + } + + } else if (aTileEntity instanceof IEnergyConnected) { + IEnergyConnected tTileEntity = (IEnergyConnected) aTileEntity; + if (tTileEntity.inputEnergyFrom(aSide,false)) { + ConsumerNode tConsumerNode = new NodeEnergyConnected(aNodeValue,tTileEntity,aSide,aConsumers); aConsumers.add(tConsumerNode); return true; } diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java new file mode 100644 index 0000000000..baff232d94 --- /dev/null +++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyConnected.java @@ -0,0 +1,22 @@ +package gregtech.api.graphs.consumers; + +import gregtech.api.interfaces.tileentity.IEnergyConnected; +import net.minecraft.tileentity.TileEntity; + +import java.util.ArrayList; + +public class NodeEnergyConnected extends ConsumerNode { + public NodeEnergyConnected(int aNodeValue, IEnergyConnected aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) { + super(aNodeValue,(TileEntity) aTileEntity, aSide, aConsumers); + } + + @Override + public boolean needsEnergy() { + return super.needsEnergy(); + } + + @Override + public int injectEnergy(int aVoltage, int aMaxAmps) { + return (int) ((IEnergyConnected)mTileEntity).injectEnergyUnits(mSide,aVoltage,aMaxAmps); + } +} diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java index c8c4c64211..a24c4acbcd 100644 --- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java +++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java @@ -17,6 +17,7 @@ import static gregtech.api.enums.GT_Values.V; //consumer for RF machines public class NodeEnergyReceiver extends ConsumerNode { + int mRestRF = 0; public NodeEnergyReceiver(int aNodeValue, IEnergyReceiver aTileEntity, byte aSide, ArrayList<ConsumerNode> aConsumers) { super(aNodeValue, (TileEntity) aTileEntity, aSide, aConsumers); } @@ -25,9 +26,15 @@ public class NodeEnergyReceiver extends ConsumerNode { public int injectEnergy(int aVoltage, int aMaxAmps) { ForgeDirection tDirection = ForgeDirection.getOrientation(mSide); int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100); - if (((IEnergyReceiver) mTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) { - ((IEnergyReceiver) mTileEntity).receiveEnergy(tDirection, rfOut, false); - return 1; + int ampsUsed = 0; + if (mRestRF < rfOut) { + mRestRF += rfOut; + ampsUsed = 1; + } + if (((IEnergyReceiver) mTileEntity).receiveEnergy(tDirection, mRestRF, true) > 0) { + int consumed = ((IEnergyReceiver) mTileEntity).receiveEnergy(tDirection, mRestRF, false); + mRestRF -= consumed; + return ampsUsed; } if (GregTech_API.mRFExplosions && GregTech_API.sMachineExplosions && ((IEnergyReceiver) mTileEntity).getMaxEnergyStored(tDirection) < rfOut * 600L) { diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 736373a9ca..96f1cdfd68 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -40,7 +40,9 @@ public class PowerNodePath extends NodePath { for (MetaPipeEntity tCable : mPipes) { if (((GT_MetaPipeEntity_Cable)tCable).mVoltage < this.mVoltage) { BaseMetaPipeEntity tBaseCable = (BaseMetaPipeEntity) tCable.getBaseMetaTileEntity(); - tBaseCable.setToFire(); + if (tBaseCable != null) { + tBaseCable.setToFire(); + } } } } @@ -52,7 +54,8 @@ public class PowerNodePath extends NodePath { for (MetaPipeEntity tCable : mPipes) { if (((GT_MetaPipeEntity_Cable)tCable).mAmperage*40 < this.mAmps) { BaseMetaPipeEntity tBaseCable = (BaseMetaPipeEntity) tCable.getBaseMetaTileEntity(); - tBaseCable.setToFire(); + if (tBaseCable != null) + tBaseCable.setToFire(); } } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index b15e520da7..de008abcab 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -205,6 +205,15 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile } } + + @Override + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + super.onPostTick(aBaseMetaTileEntity, aTick); + if (aTick%20 == 0 && aBaseMetaTileEntity.isServerSide() && (!GT_Mod.gregtechproxy.gt6Cable || mCheckConnections)) { + checkConnections(); + } + } + @Override public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (GT_Mod.gregtechproxy.gt6Cable && GT_ModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) { diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index d886055050..2e49a3888c 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1298,7 +1298,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L), new ItemStack(Items.slime_ball, 1, 32767), new ItemStack(Items.magma_cream, 1, 0), 50); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 8), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1), Materials.Air.getGas(1000), Materials.Radon.getGas(100), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 8), 12000, 8); - GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 64L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 8L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1L), GT_Utility.getIntegratedCircuit(9)}, new FluidStack[]{Materials.Air.getGas(9000L)}, new FluidStack[]{Materials.Radon.getGas(900L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 64L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 8L)}, 1688, 512); + GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 64L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1L), GT_Utility.getIntegratedCircuit(8)}, new FluidStack[]{Materials.Air.getGas(8000L)}, new FluidStack[]{Materials.Radon.getGas(800L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 64L)}, 3000, 480); GT_Values.RA.addChemicalBathRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1), Materials.Radon.getGas(250), ItemList.QuantumEye.get(1L), null, null, null, 480, 384); GT_Values.RA.addChemicalBathRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), Materials.Radon.getGas(1250), ItemList.QuantumStar.get(1L), null, null, null, 1920, 384); GT_Values.RA.addAutoclaveRecipe(GT_OreDictUnificator.get(ItemList.QuantumStar.get(1L)), Materials.Neutronium.getMolten(288), ItemList.Gravistar.get(1L), 10000, 480, 7680); diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java index 95e9db8310..55a0736490 100644 --- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java +++ b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java @@ -197,7 +197,7 @@ public class GT_Worldgenloader implements Runnable { new GT_Worldgen_GT_Ore_Layer("ore.mix.netherstar", true, 20, 60, 60, 2, 24, false, false, false, Materials.GarnetSand, Materials.NetherStar, Materials.GarnetRed, Materials.GarnetYellow); new GT_Worldgen_GT_Ore_Layer("ore.mix.garnet", true, 10, 30, 40, 2, 16, false, false, false, Materials.GarnetRed, Materials.GarnetYellow, Materials.Chrysotile, Materials.Realgar); new GT_Worldgen_GT_Ore_Layer("ore.mix.rareearth", true, 30, 60, 40, 2, 24, false, false, false, Materials.Cadmium, Materials.Caesium, Materials.Lanthanum, Materials.Cerium); - new GT_Worldgen_GT_Ore_Layer("ore.mix.richnuclear", true, 65, 120, 5, 2, 8, false, false, false, Materials.Uranium, Materials.Plutonium, Materials.Thorium, Materials.Thorium); + new GT_Worldgen_GT_Ore_Layer("ore.mix.richnuclear", true, 55, 120, 5, 2, 8, false, false, false, Materials.Uranium, Materials.Plutonium, Materials.Thorium, Materials.Thorium); new GT_Worldgen_GT_Ore_Layer("ore.mix.heavypentele", true, 40, 60, 60, 5, 32, false, false, false, Materials.Arsenic, Materials.Bismuth, Materials.Antimony, Materials.Antimony); new GT_Worldgen_GT_Ore_Layer("ore.mix.europa", true, 55, 65, 110, 4, 24, false, false, false, Materials.Magnesite, Materials.BandedIron, Materials.Sulfur, Materials.Opal); new GT_Worldgen_GT_Ore_Layer("ore.mix.europacore", true, 5, 15, 5, 2, 16, false, false, false, Materials.Chrome, Materials.Tungstate, Materials.Molybdenum, Materials.Manganese); diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 51b792f44f..b0d0018312 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -1047,3 +1047,87 @@ gregtech.lifeBlink=Blink gregtech.lifeEon=Eon entity.gregtech.GT_Entity_Arrow.name= a GregTech arrow + +fluid.Xenon=Xenon +fluid.FermentedBacterialSludge=Fermented Bacterial Sludge +fluid.NitricAcid=Nitric Acid +fluid.EnrichedBacterialSludge=Enriched Bacterial Sludge +fluid.Ammonia=Ammonia +fluid.Neon=Neon +fluid.Oganesson=Oganesson +fluid.Aqua Regia=Aqua Regia +fluid.Ammonium Chloride=Ammonium Chloride +fluid.Platinum Concentrate=Platinum Concentrate +fluid.Sodium Formate=Sodium Formate +fluid.Formic Acid=Formic Acid +fluid.Palladium Enriched Ammonia=Palladium Enriched Ammonia +fluid.Ruthenium Tetroxide=Ruthenium Tetroxide +fluid.Hot Ruthenium Tetroxide Solution=Hot Ruthenium Tetroxide Solution +fluid.Ruthenium Tetroxide Solution=Ruthenium Tetroxide Solution +fluid.Rhodium Sulfate=Rhodium Sulfate +fluid.Rhodium Sulfate Solution=Rhodium Sulfate Solution +fluid.Calcium Chloride=Calcium Chloride +fluid.Acidic Osmium Solution=Acidic Osmium Solution +fluid.Osmium Solution=Osmium Solution +fluid.Acidic Iridium Solution=Acidic Iridium Solution +fluid.Rhodium Salt Solution=Rhodium Salt Solution +fluid.Rhodium Filter Cake Solution=Rhodium Filter Cake Solution +fluid.Pollution=Pollution +fluid.SodiumPotassium=Sodium Potassium +fluid.Concrete=Concrete +fluid.mushroomStew=Mushroom Stew + +fluid.Sodium Tungstate=Sodium Tungstate +fluid.Phosgene=Phosgene +fluid.Ethyl Chloroformate=Ethyl Chloroformate +fluid.Ethyl Carbamate=Ethyl Carbamate +fluid.Ethyl N-nitrocarbamate=Ethyl N-nitrocarbamate +fluid.Ammonium N-nitrourethane=Ammonium N-nitrourethane +fluid.Trinitramid=Trinitramid +fluid.Ammonia Boronfluoride Solution=Ammonia Boronfluoride Solution +fluid.Sodium Tetrafluoroborate=Sodium Tetrafluoroborate +fluid.Tetrafluoroborate=Tetrafluoroborate +fluid.Ethyl Acetate=Ethyl Acetate +fluid.Acetylhydrazine=Acetylhydrazine +fluid.Unsymmetrical Dimethylhydrazine=Unsymmetrical Dimethylhydrazine +fluid.Monomethylhydrazine Fuel Mix=Monomethylhydrazine Fuel Mix +fluid.Unsymmetrical Dimethylhydrazine Fuel Mix=Unsymmetrical Dimethylhydrazine Fuel Mix +fluid.Boron Trifluoride=Boron Trifluoride +fluid.Tert-Butylbenzene=Tert-Butylbenzene +fluid.2-tert-butyl-anthraquinone=2-tert-butyl-anthraquinone +fluid.2-tert-butyl-anthrahydroquinone=2-tert-butyl-anthrahydroquinone +fluid.Hydrogen Peroxide=Hydrogen Peroxide +fluid.hydrazine=hydrazine +fluid.Dimethyl Sulfate=Dimethyl Sulfate +fluid.Ethyl Dinitrocarbamate=Ethyl Dinitrocarbamate +fluid.Ammonium Dinitramide=Ammonium Dinitramide +fluid.LMP-103S=LMP-103S +fluid.Nitromethane=Nitromethane +fluid.O-Xylene=O-Xylene +//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 +fluid.redplasma=redplasma +fluid.tile.fluidBlockSludge=fluidBlockSludge +//No Textrue +fluid.guano=guano +fluid.poo=poo +fluid.sewerage=sewerage +fluid.fuelgc=fuelgc +fluid.dirtywater=dirtywater +fluid.oilgc=oilgc
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index a77d59f0eb..5d7ebab206 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -189,7 +189,7 @@ achievement.Powellite=找到钼钙矿矿石 achievement.Powellite.desc=高度：20-50，几率：5，下界/暮色森林/月球/火卫一/谷神星/水星/土卫六/海卫八/冥王星/巴德纳E// achievement.Scheelite=找到白钨矿矿石 achievement.Scheelite.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// -achievement.Tungstate=找到钨酸盐矿石 +achievement.Tungstate=找到钨酸锂矿石 achievement.Tungstate.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// achievement.Lithium=找到锂矿石 achievement.Lithium.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// @@ -453,19 +453,19 @@ achievement.flintpick.desc=制造一把燧石镐 achievement.crops=农业 achievement.crops.desc=制造农作物 achievement.havestlead=收获铅 -achievement.havestlead.desc=得到铅叶花 +achievement.havestlead.desc=得到铅叶子 achievement.havestcopper=收获铜 achievement.havestcopper.desc=得到铜纤维 achievement.havesttin=收获锡 -achievement.havesttin.desc=得到锡叶花 +achievement.havesttin.desc=得到锡叶子 achievement.havestoil=收获石油 achievement.havestoil.desc=得到石油浆果 achievement.havestiron=收获铁 -achievement.havestiron.desc=得到铁叶花 +achievement.havestiron.desc=得到铁叶子 achievement.havestgold=收获金 -achievement.havestgold.desc=得到金叶花 +achievement.havestgold.desc=得到金叶子 achievement.havestsilver=收获银 -achievement.havestsilver.desc=得到银叶花 +achievement.havestsilver.desc=得到银叶子 achievement.havestemeralds=收获绿宝石 achievement.havestemeralds.desc=得到易如反掌浆果 achievement.tools=更多的工具 @@ -543,7 +543,7 @@ achievement.thatspower.desc=得到一个兰波顿能量球簇 achievement.datasaving=数据存储 achievement.datasaving.desc=得到一个数据球 achievement.superbuffer=超级缓冲 -achievement.superbuffer.desc=制造一个LV级大型缓冲器 +achievement.superbuffer.desc=制造一个LV超级缓冲器 achievement.newstorage=新型存储 achievement.newstorage.desc=制造一个量子箱 achievement.whereistheocean=大海在哪里? @@ -568,7 +568,7 @@ achievement.pumpcover=泵 achievement.pumpcover.desc=制造一个电动泵(LV) achievement.closeit=把它关了! achievement.closeit.desc=得到一块扇板 -achievement.slurp=Slurp +achievement.slurp=嘶溜嘶溜 achievement.slurp.desc=制造一台进阶泵 II achievement.transport=运输 achievement.transport.desc=制造一个输送机模块(LV) @@ -587,7 +587,7 @@ achievement.steampower.desc=制造一台基础蒸汽轮机 achievement.batterys=蓄电池 achievement.batterys.desc=制造一个电池箱 achievement.badweather=坏天气 -achievement.badweather.desc=忘记给机器上方建屋顶 +achievement.badweather.desc=忘记在机器上方建屋顶 achievement.electricproblems=电力问题 achievement.electricproblems.desc=因为超过电压损失一台机器 achievement.ebf=电力高炉 @@ -627,7 +627,7 @@ achievement.tungsten.desc=冷却一块热钨锭 achievement.osmium=锇 achievement.osmium.desc=冷却一块热锇锭 achievement.hightech=高科技 -achievement.hightech.desc=制造一台力场产生器(LV) +achievement.hightech.desc=制造一个力场发生器(LV) achievement.amplifier=增幅器 achievement.amplifier.desc=制造一台UU增幅液产生器 achievement.scanning=扫描 @@ -635,9 +635,9 @@ achievement.scanning.desc=完成一次成分扫描 achievement.alienpower=外星能量 achievement.alienpower.desc=制造一台硅岩反应堆Mk.I achievement.universal=通用的 -achievement.universal.desc=制造一台质量加工器 +achievement.universal.desc=制造一台质量发生器 achievement.replication=复制 -achievement.replication.desc=制造一台复制器 +achievement.replication.desc=制造一台复制机 achievement.tungstensteel=钨钢 achievement.tungstensteel.desc=冷却一块热钨钢锭 achievement.upgrade3=升级你的线圈(Lv.3) @@ -775,6 +775,12 @@ achievement.gt.blockmachines.hatch.energy.tier.08=能源仓(UV) achievement.gt.blockmachines.hatch.energy.tier.08.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.hatch.energy.tier.09=能源仓(UHV) achievement.gt.blockmachines.hatch.energy.tier.09.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.10=能源仓(UEV) +achievement.gt.blockmachines.hatch.energy.tier.10.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.11=能源仓(UIV) +achievement.gt.blockmachines.hatch.energy.tier.11.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.12=能源仓(UMV) +achievement.gt.blockmachines.hatch.energy.tier.12.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.hatch.dynamo.tier.06=动力仓(LuV) achievement.gt.blockmachines.hatch.dynamo.tier.06.desc=捡起这个物品以在NEI内查看配方 @@ -784,6 +790,12 @@ achievement.gt.blockmachines.hatch.dynamo.tier.08=动力仓(UV) achievement.gt.blockmachines.hatch.dynamo.tier.08.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.hatch.dynamo.tier.09=动力仓(UHV) achievement.gt.blockmachines.hatch.dynamo.tier.09.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.10=动力仓(UEV) +achievement.gt.blockmachines.hatch.dynamo.tier.10.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.11=动力仓(UIV) +achievement.gt.blockmachines.hatch.dynamo.tier.11.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.12=动力仓(UMV) +achievement.gt.blockmachines.hatch.dynamo.tier.12.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.fusioncomputer.tier.06=核聚变反应堆控制电脑Mk I achievement.gt.blockmachines.fusioncomputer.tier.06.desc=捡起这个物品以在NEI内查看配方 @@ -809,6 +821,8 @@ achievement.item.PikoCircuit=Piko电路 achievement.item.PikoCircuit.desc=捡起这个物品以在NEI内查看配方 achievement.item.QuantumCircuit=量子电路 achievement.item.QuantumCircuit.desc=捡起这个物品以在NEI内查看配方 +achievement.item.relocator=定位器 +achievement.item.relocator.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockmachines.multimachine.em.computer=量子计算机 achievement.gt.blockmachines.multimachine.em.computer.desc=捡起这个物品以在NEI内查看配方 @@ -870,6 +884,9 @@ achievement.item.graviChestPlate.desc=捡起这个物品以在NEI内查看配方 achievement.gt.blockreinforced.12=漆黑之门粗胚 achievement.gt.blockreinforced.12.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.debug.tt.maintenance=Debug维护仓 +achievement.gt.blockmachines.debug.tt.maintenance.desc=捡起这个物品以在NEI内查看配方 + for.bees.species.clay=粘土 for.bees.species.slimeball=粘液球 for.bees.species.peat=泥炭 @@ -1029,3 +1046,88 @@ gregtech.speedAccelerated=加速 gregtech.lifeBlink=瞬灭 gregtech.lifeEon=永生 +entity.gregtech.GT_Entity_Arrow.name=GT箭头 + +fluid.Xenon=氙气 +fluid.FermentedBacterialSludge=发酵的细菌污泥 +fluid.NitricAcid=硝酸 +fluid.EnrichedBacterialSludge=放射性细菌污泥 +fluid.Ammonia=氨气 +fluid.Neon=氖气 +fluid.Oganesson=<气奥> +fluid.Aqua Regia=王水 +fluid.Ammonium Chloride=氯化铵 +fluid.Platinum Concentrate=浓缩铂 +fluid.Sodium Formate=甲酸钠 +fluid.Formic Acid=甲酸 +fluid.Palladium Enriched Ammonia=富钯氨 +fluid.Ruthenium Tetroxide=四氧化钌 +fluid.Hot Ruthenium Tetroxide Solution=热四氧化钌溶液 +fluid.Ruthenium Tetroxide Solution=四氧化钌溶液 +fluid.Rhodium Sulfate=硫酸铑 +fluid.Rhodium Sulfate Solution=硫酸铑溶液 +fluid.Calcium Chloride=氯化钙 +fluid.Acidic Osmium Solution=酸性锇溶液 +fluid.Osmium Solution=锇溶液 +fluid.Acidic Iridium Solution=酸性铱溶液 +fluid.Rhodium Salt Solution=铑盐溶液 +fluid.Rhodium Filter Cake Solution=铑滤饼溶液 +fluid.Pollution=污染物 +fluid.SodiumPotassium=钠钾共晶合金(NaK) +fluid.Concrete=混凝土 +fluid.mushroomStew=蘑菇煲 + +fluid.Sodium Tungstate=钨酸钠 +fluid.Phosgene=碳酰氯 +fluid.Ethyl Chloroformate=氯基甲酸乙酯 +fluid.Ethyl Carbamate=氨基甲酸乙酯 +fluid.Ethyl N-nitrocarbamate=N-硝氨基甲酸乙酯 +fluid.Ammonium N-nitrourethane=N-硝氨基甲酸乙酯-铵 +fluid.Trinitramid=三硝基胺 +fluid.Ammonia Boronfluoride Solution=氟化硼氨溶液 +fluid.Sodium Tetrafluoroborate=氟硼酸钠 +fluid.Tetrafluoroborate=氟硼酸 +fluid.Ethyl Acetate=乙酸乙酯 +fluid.Acetylhydrazine=乙酰肼 +fluid.Unsymmetrical Dimethylhydrazine=偏二甲肼 +fluid.Monomethylhydrazine Fuel Mix=一甲基肼混合燃料 +fluid.Unsymmetrical Dimethylhydrazine Fuel Mix=偏二甲肼混合燃料 +fluid.Boron Trifluoride=三氟化硼 +fluid.Tert-Butylbenzene=叔丁基苯 +fluid.2-tert-butyl-anthraquinone=2-叔丁基蒽醌 +fluid.2-tert-butyl-anthrahydroquinone=2-叔丁基蒽氢醌 +fluid.Hydrogen Peroxide=过氧化氢 +fluid.hydrazine=肼 +fluid.Dimethyl Sulfate=硫酸二甲酯 +fluid.Ethyl Dinitrocarbamate=二硝氨基甲酸乙酯 +fluid.Ammonium Dinitramide=二硝酰胺铵 +fluid.LMP-103S=LMP-103S +fluid.Nitromethane=硝基甲烷 +fluid.O-Xylene=邻二甲苯 +//以下流体没有单元形式，大部分是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=压缩氮气 +fluid.redplasma=红等离子体 +fluid.tile.fluidBlockSludge=污泥 +//以下流体没有贴图 +fluid.guano=鸟粪 +fluid.poo=便便 +fluid.sewerage=下水 +fluid.fuelgc=GC燃油 +fluid.dirtywater=污水 +fluid.oilgc=GC石油
\ No newline at end of file |