aboutsummaryrefslogtreecommitdiff
path: root/src/resources/assets/miscutils
diff options
context:
space:
mode:
author‭huajijam <strhuaji@gmail.com>2019-03-18 20:52:30 +0800
committer‭huajijam <strhuaji@gmail.com>2019-03-18 20:52:30 +0800
commit8b090e1fd20eb4c301996b5e1dfeb78353e595e4 (patch)
tree52152dd767d195c76baa8fd8bacb14b105aaa146 /src/resources/assets/miscutils
parent40d7e5da9f5b84213e2c3e4596fdc69b94bd523e (diff)
downloadGT5-Unofficial-8b090e1fd20eb4c301996b5e1dfeb78353e595e4.tar.gz
GT5-Unofficial-8b090e1fd20eb4c301996b5e1dfeb78353e595e4.tar.bz2
GT5-Unofficial-8b090e1fd20eb4c301996b5e1dfeb78353e595e4.zip
fix a bug
Diffstat (limited to 'src/resources/assets/miscutils')
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang131
-rw-r--r--src/resources/assets/miscutils/lang/zh_CN.lang240
-rw-r--r--src/resources/assets/miscutils/textures/aspects/Sagrausten.pngbin0 -> 2997 bytes
-rw-r--r--src/resources/assets/miscutils/textures/aspects/Slusium.pngbin0 -> 697 bytes
-rw-r--r--src/resources/assets/miscutils/textures/aspects/Xablum.pngbin0 -> 563 bytes
-rw-r--r--src/resources/assets/miscutils/textures/aspects/Xenil.pngbin0 -> 1000 bytes
-rw-r--r--src/resources/assets/miscutils/textures/aspects/Zetralt.pngbin0 -> 1461 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.pngbin0 -> 379 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.pngbin0 -> 373 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.pngbin0 -> 375 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.pngbin0 -> 375 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.pngbin0 -> 220 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.pngbin0 -> 399 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.pngbin0 -> 572 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.pngbin0 -> 534 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.pngbin0 -> 661 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.pngbin0 -> 9232 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.pngbin0 -> 9586 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta5
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.pngbin0 -> 300 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.pngbin0 -> 304 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.pngbin0 -> 299 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.pngbin0 -> 297 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.pngbin0 -> 393 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/111.pngbin0 -> 345 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/112.pngbin0 -> 341 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/113.pngbin0 -> 337 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/114.pngbin0 -> 396 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/115.pngbin0 -> 428 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.pngbin470 -> 392 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.pngbin470 -> 390 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.pngbin450 -> 398 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bomb.pngbin0 -> 311 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bomb_casing.pngbin0 -> 280 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bomb_lit.pngbin0 -> 328 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/bucket.generic.overlay.pngbin0 -> 279 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/research/note.pngbin0 -> 348 bytes
38 files changed, 247 insertions, 132 deletions
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 723f3b6826..e1102d708e 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -549,34 +549,34 @@ item.itemNuggetUranium233.name=Uranium 233 Nugget
item.itemPlateUranium233.name=Uranium 233 Plate
item.itemRodUranium233.name=Uranium 233 Rod
item.itemRodLongUranium233.name=Long Uranium 233 Rod
-item.itemIngotPlutonium238.name=Plutonium-238 Ingot
-item.itemDustPlutonium238.name=Plutonium-238 Dust
-item.itemDustTinyPlutonium238.name=Tiny Pile of Plutonium-238 Dust
-item.itemDustSmallPlutonium238.name=Small Pile of Plutonium-238 Dust
-item.itemNuggetPlutonium238.name=Plutonium-238 Nugget
-item.itemPlatePlutonium238.name=Plutonium-238 Plate
-item.itemPlateDoublePlutonium238.name=Double Plutonium-238 Plate
-item.itemIngotStrontium90.name=Strontium-90 Ingot
-item.itemDustStrontium90.name=Strontium-90 Dust
-item.itemDustTinyStrontium90.name=Tiny Pile of Strontium-90 Dust
-item.itemDustSmallStrontium90.name=Small Pile of Strontium-90 Dust
-item.itemNuggetStrontium90.name=Strontium-90 Nugget
-item.itemPlateStrontium90.name=Strontium-90 Plate
-item.itemPlateDoubleStrontium90.name=Double Strontium-90 Plate
-item.itemIngotPolonium210.name=Polonium-210 Ingot
-item.itemDustPolonium210.name=Polonium-210 Dust
-item.itemDustTinyPolonium210.name=Tiny Pile of Polonium-210 Dust
-item.itemDustSmallPolonium210.name=Small Pile of Polonium-210 Dust
-item.itemNuggetPolonium210.name=Polonium-210 Nugget
-item.itemPlatePolonium210.name=Polonium-210 Plate
-item.itemPlateDoublePolonium210.name=Double Polonium-210 Plate
-item.itemIngotAmericium241.name=Americium-241 Ingot
-item.itemDustAmericium241.name=Americium-241 Dust
-item.itemDustTinyAmericium241.name=Tiny Pile of Americium-241 Dust
-item.itemDustSmallAmericium241.name=Small Pile of Americium-241 Dust
-item.itemNuggetAmericium241.name=Americium-241 Nugget
-item.itemPlateAmericium241.name=Americium-241 Plate
-item.itemPlateDoubleAmericium241.name=Double Americium-241 Plate
+item.itemIngotPlutonium238.name=Plutonium 238 Ingot
+item.itemDustPlutonium238.name=Plutonium 238 Dust
+item.itemDustTinyPlutonium238.name=Tiny Pile of Plutonium 238 Dust
+item.itemDustSmallPlutonium238.name=Small Pile of Plutonium 238 Dust
+item.itemNuggetPlutonium238.name=Plutonium 238 Nugget
+item.itemPlatePlutonium238.name=Plutonium 238 Plate
+item.itemPlateDoublePlutonium238.name=Double Plutonium 238 Plate
+item.itemIngotStrontium90.name=Strontium 90 Ingot
+item.itemDustStrontium90.name=Strontium 90 Dust
+item.itemDustTinyStrontium90.name=Tiny Pile of Strontium 90 Dust
+item.itemDustSmallStrontium90.name=Small Pile of Strontium 90 Dust
+item.itemNuggetStrontium90.name=Strontium 90 Nugget
+item.itemPlateStrontium90.name=Strontium 90 Plate
+item.itemPlateDoubleStrontium90.name=Double Strontium 90 Plate
+item.itemIngotPolonium210.name=Polonium 210 Ingot
+item.itemDustPolonium210.name=Polonium 210 Dust
+item.itemDustTinyPolonium210.name=Tiny Pile of Polonium 210 Dust
+item.itemDustSmallPolonium210.name=Small Pile of Polonium 210 Dust
+item.itemNuggetPolonium210.name=Polonium 210 Nugget
+item.itemPlatePolonium210.name=Polonium 210 Plate
+item.itemPlateDoublePolonium210.name=Double Polonium 210 Plate
+item.itemIngotAmericium241.name=Americium 241 Ingot
+item.itemDustAmericium241.name=Americium 241 Dust
+item.itemDustTinyAmericium241.name=Tiny Pile of Americium 241 Dust
+item.itemDustSmallAmericium241.name=Small Pile of Americium 241 Dust
+item.itemNuggetAmericium241.name=Americium 241 Nugget
+item.itemPlateAmericium241.name=Americium 241 Plate
+item.itemPlateDoubleAmericium241.name=Double Americium 241 Plate
item.itemIngotSiliconCarbide.name=Silicon Carbide Ingot
item.itemDustSiliconCarbide.name=Silicon Carbide Dust
item.itemDustTinySiliconCarbide.name=Tiny Pile of Silicon Carbide Dust
@@ -1803,10 +1803,10 @@ tile.Block of Fermium.name=Block of Fermium
tile.Block of Thorium 232.name=Block of Thorium 232
tile.Block of Uranium 232.name=Block of Uranium 232
tile.Block of Uranium 233.name=Block of Uranium 233
-tile.Block of Plutonium-238.name=Block of Plutonium-238
-tile.Block of Strontium-90.name=Block of Strontium-90
-tile.Block of Polonium-210.name=Block of Polonium-210
-tile.Block of Americium-241.name=Block of Americium-241
+tile.Block of Plutonium-238.name=Block of Plutonium 238
+tile.Block of Strontium-90.name=Block of Strontium 90
+tile.Block of Polonium-210.name=Block of Polonium 210
+tile.Block of Americium-241.name=Block of Americium 241
tile.Block of Silicon Carbide.name=Block of Silicon Carbide
tile.Silicon Carbide Frame Box.name=Silicon Carbide Frame Box
tile.Block of Zirconium Carbide.name=Block of Zirconium Carbide
@@ -1949,7 +1949,7 @@ tile.blockDarkWorldPortalFrame.name=Containment Frame
//Added 1/4/18
-tile.Block of Plutonium-239.name=Block of Uranium-239
+tile.Block of Plutonium-239.name=Block of Plutonium-239
tile.Fluorite Ore [Old].name=Fluorite Ore [Deprecated]
tile.blockMiningPipeFake.name=Strengthened Mining Pipe
tile.blockMiningHeadFake.name=Bedrock Drill
@@ -1973,10 +1973,10 @@ item.itemDustTinyPromethium.name=Tiny Pile of Promethium
item.itemDustPromethium.name=Promethium Dust
tile.Block of Promethium.name=Block of Promethium
-item.itemCellAmericium241.name=Americium-241 Cell
-item.itemCellPolonium210.name=Polonium-210 Cell
-item.itemCellStrontium90.name=Strontium-90 Cell
-item.itemCellPlutonium238.name=Plutonium-238 Cell
+item.itemCellAmericium241.name=Americium 241 Cell
+item.itemCellPolonium210.name=Polonium 210 Cell
+item.itemCellStrontium90.name=Strontium 90 Cell
+item.itemCellPlutonium238.name=Plutonium 238 Cell
entity.MiningCharge.name=Mining Charge
entity.throwablePotionSulfuric.name=Flask of Sulfuric Acid
@@ -2709,10 +2709,65 @@ tile.playerDoorIce.name=Ice Auto-Door
tile.playerDoorIron.name=Iron Auto-Door
tile.playerDoorWood.name=Wooden Auto-Door
-/Added 4/2/19
+//Added 4/2/19
item.GTPP.BattPack.06.name=Charge Pack [LuV]
item.GTPP.BattPack.07.name=Charge Pack [ZPM]
item.GTPP.BattPack.08.name=Charge Pack [UV]
item.GTPP.BattPack.09.name=Charge Pack [MAX]
+
+//Added 13/3/19
+item.gtpp.debug.scanner.name=GT++ Debug Scanner
+item.RawWaste.name=Cell of Animal Waste
+item.ManureSlurry.name=Cell of Manure Slurry
+item.FertileManureSlurry.name=Cell of Fertile Slurry
+item.itemDustTinyDemicheleiteBr.name=Tiny Pile of Demicheleite (Br)
+item.itemDustSmallDemicheleiteBr.name=Small Pile of Demicheleite (Br)
+tile.blockPooCollector.name=Agricultural Sewer
+tile.Block of Lithium 7.name=Block of Lithium 7
+
+//Added 14/3/19
+item.blood.name=Cell of Blood
+item.aniline.name=Aniline Cell
+item.cadaverine.name=Cadaverine Cell
+item.polyurethane.name=Polyurethane Cell
+item.putrescine.name=Putrescine Cell
+item.cyclohexane.name=Cyclohexane Cell
+item.cyclohexanone.name=Cyclohexanone Cell
+item.nitrobenzene.name=Nitrobenzene Cell
+item.ender.name=Cell of Liquid Ender
+item.xpjuice.name=Cell of Liquid Xp
+item.itemBombUnf.name=Throwable Bomb (unf)
+item.itemBombCasing.name=Bomb Casing
+item.gtpp.throwable.bomb.name=Throwable Bomb
+item.itemDetCable.name=Bomb Fuse
+tile.blockPooCollector.0.name=Agricultural Sewer
+tile.blockPooCollector.8.name=Biocomposite Collector
+item.itemIngotBakelite.name=Bakelite Ingot
+item.itemDustBakelite.name=Bakelite Dust
+item.itemDustTinyBakelite.name=Tiny Pile of Bakelite Dust
+item.itemDustSmallBakelite.name=Small Pile of Bakelite Dust
+item.itemNuggetBakelite.name=Bakelite Nugget
+item.itemPlateBakelite.name=Bakelite Plate
+item.itemPlateDoubleBakelite.name=Double Bakelite Plate
+item.itemCellBakelite.name=Bakelite Cell
+tile.Block of Bakelite.name=Block of Bakelite
+item.itemIngotNylon.name=Nylon Ingot
+item.itemDustNylon.name=Nylon Dust
+item.itemDustTinyNylon.name=Tiny Pile of Nylon Dust
+item.itemDustSmallNylon.name=Small Pile of Nylon Dust
+item.itemNuggetNylon.name=Nylon Nugget
+item.itemPlateNylon.name=Nylon Plate
+item.itemPlateDoubleNylon.name=Double Nylon Plate
+item.itemCellNylon.name=Nylon Cell
+tile.Block of Nylon.name=Block of Nylon
+item.itemIngotTeflon.name=Teflon Ingot
+item.itemDustTeflon.name=Teflon Dust
+item.itemDustTinyTeflon.name=Tiny Pile of Teflon Dust
+item.itemDustSmallTeflon.name=Small Pile of Teflon Dust
+item.itemNuggetTeflon.name=Teflon Nugget
+item.itemPlateTeflon.name=Teflon Plate
+item.itemPlateDoubleTeflon.name=Double Teflon Plate
+item.itemCellTeflon.name=Teflon Cell
+tile.Block of Teflon.name=Block of Teflon \ No newline at end of file
diff --git a/src/resources/assets/miscutils/lang/zh_CN.lang b/src/resources/assets/miscutils/lang/zh_CN.lang
index 2a8c474081..3c41f9af3b 100644
--- a/src/resources/assets/miscutils/lang/zh_CN.lang
+++ b/src/resources/assets/miscutils/lang/zh_CN.lang
@@ -168,11 +168,11 @@ item.itemHotFoodCurriedSausages.name=一份热咖喱香肠
//Conversion Dusts
-item.dustNeptunium238.name=镎-238粉
-item.dustRadium226.name=镭-226粉
-item.itemDustDecayedRadium226.name=衰变镭-226粉
-item.itemDustSmallDecayedRadium226.name=小堆衰变镭-226粉
-item.itemDustTinyDecayedRadium226.name=小撮衰变镭-226粉
+item.dustNeptunium238.name=镎 238粉
+item.dustRadium226.name=镭 226粉
+item.itemDustDecayedRadium226.name=衰变镭 226粉
+item.itemDustSmallDecayedRadium226.name=小堆衰变镭 226粉
+item.itemDustTinyDecayedRadium226.name=小撮衰变镭 226粉
//Material Items
item.itemDustGadolinium.name=钆粉
@@ -228,8 +228,8 @@ item.itemRingSelenium.name=硒环
item.itemScrewSelenium.name=硒螺丝
item.itemRotorSelenium.name=硒转子
item.itemGearSelenium.name=硒齿轮
-item.itemCellUranium232.name=铀-232单元
-item.itemCellUranium233.name=铀-233单元
+item.itemCellUranium232.name=铀 232单元
+item.itemCellUranium233.name=铀 233单元
item.itemCellThoriumTetrafluoride.name=四氟化钍单元
item.itemCellThoriumHexafluoride.name=六氟化钍单元
item.itemCellUraniumTetrafluoride.name=四氟化铀单元
@@ -519,64 +519,64 @@ item.itemDustSmallFermium.name=小堆镄粉
item.itemNuggetFermium.name=镄粒
item.itemPlateFermium.name=镄板
item.itemPlateDoubleFermium.name=双重镄板
-item.itemIngotLithium7.name=锂-7锭
-item.itemDustLithium7.name=锂-7粉
-item.itemDustTinyLithium7.name=小撮锂-7粉
-item.itemDustSmallLithium7.name=小堆锂-7粉
-item.itemNuggetLithium7.name=锂-7粒
-item.itemPlateLithium7.name=锂-7板
-item.itemPlateDoubleLithium7.name=双重锂-7板
-item.itemIngotThorium232.name=钍-232锭
-item.itemDustThorium232.name=钍-232粉
-item.itemDustTinyThorium232.name=小撮钍-232粉
-item.itemDustSmallThorium232.name=小堆钍-232粉
-item.itemNuggetThorium232.name=钍-232粒
-item.itemPlateThorium232.name=钍-232板
-item.itemPlateDoubleThorium232.name=双重钍-232板
-item.itemIngotUranium232.name=铀-232锭
-item.itemDustUranium232.name=铀-232粉
-item.itemDustTinyUranium232.name=小撮铀-232粉
-item.itemDustSmallUranium232.name=小堆铀-232粉
-item.itemNuggetUranium232.name=铀-232粒
-item.itemPlateUranium232.name=铀-232板
-item.itemRodUranium232.name=铀-232杆
-item.itemRodLongUranium232.name=长铀-232杆
-item.itemIngotUranium233.name=铀-233锭
-item.itemDustUranium233.name=铀-233粉
-item.itemDustTinyUranium233.name=小撮铀-233粉
-item.itemDustSmallUranium233.name=小堆铀-233粉
-item.itemNuggetUranium233.name=铀-233粒
-item.itemPlateUranium233.name=铀-233板
-item.itemRodUranium233.name=铀-233杆
-item.itemRodLongUranium233.name=长铀-233杆
-item.itemIngotPlutonium238.name=钚-238锭
-item.itemDustPlutonium238.name=钚-238粉
-item.itemDustTinyPlutonium238.name=小撮钚-238粉
-item.itemDustSmallPlutonium238.name=小堆钚-238粉
-item.itemNuggetPlutonium238.name=钚-238粒
-item.itemPlatePlutonium238.name=钚-238板
-item.itemPlateDoublePlutonium238.name=双重钚-238板
-item.itemIngotStrontium90.name=锶-90锭
-item.itemDustStrontium90.name=锶-90粉
-item.itemDustTinyStrontium90.name=小撮锶-90粉
-item.itemDustSmallStrontium90.name=小堆锶-90粉
-item.itemNuggetStrontium90.name=锶-90粒
-item.itemPlateStrontium90.name=锶-90板
-item.itemPlateDoubleStrontium90.name=双重锶-90板
-item.itemIngotPolonium210.name=钋-210锭
-item.itemDustPolonium210.name=钋-210粉
-item.itemDustTinyPolonium210.name=小撮钋-210粉
-item.itemDustSmallPolonium210.name=小堆钋-210粉
-item.itemNuggetPolonium210.name=钋-210粒
-item.itemPlatePolonium210.name=钋-210板
-item.itemPlateDoublePolonium210.name=双重钋-210板
-item.itemIngotAmericium241.name=镅-241锭
-item.itemDustAmericium241.name=镅-241粉
-item.itemDustTinyAmericium241.name=小撮镅-241粉
-item.itemDustSmallAmericium241.name=小堆镅-241粉
-item.itemNuggetAmericium241.name=镅-241粒
-item.itemPlateAmericium241.name=镅-241板
-item.itemPlateDoubleAmericium241.name=双重镅-241板
+item.itemIngotLithium7.name=锂 7锭
+item.itemDustLithium7.name=锂 7粉
+item.itemDustTinyLithium7.name=小撮锂 7粉
+item.itemDustSmallLithium7.name=小堆锂 7粉
+item.itemNuggetLithium7.name=锂 7粒
+item.itemPlateLithium7.name=锂 7板
+item.itemPlateDoubleLithium7.name=双重锂 7板
+item.itemIngotThorium232.name=钍 232锭
+item.itemDustThorium232.name=钍 232粉
+item.itemDustTinyThorium232.name=小撮钍 232粉
+item.itemDustSmallThorium232.name=小堆钍 232粉
+item.itemNuggetThorium232.name=钍 232粒
+item.itemPlateThorium232.name=钍 232板
+item.itemPlateDoubleThorium232.name=双重钍 232板
+item.itemIngotUranium232.name=铀 232锭
+item.itemDustUranium232.name=铀 232粉
+item.itemDustTinyUranium232.name=小撮铀 232粉
+item.itemDustSmallUranium232.name=小堆铀 232粉
+item.itemNuggetUranium232.name=铀 232粒
+item.itemPlateUranium232.name=铀 232板
+item.itemRodUranium232.name=铀 232杆
+item.itemRodLongUranium232.name=长铀 232杆
+item.itemIngotUranium233.name=铀 233锭
+item.itemDustUranium233.name=铀 233粉
+item.itemDustTinyUranium233.name=小撮铀 233粉
+item.itemDustSmallUranium233.name=小堆铀 233粉
+item.itemNuggetUranium233.name=铀 233粒
+item.itemPlateUranium233.name=铀 233板
+item.itemRodUranium233.name=铀 233杆
+item.itemRodLongUranium233.name=长铀 233杆
+item.itemIngotPlutonium238.name=钚 238锭
+item.itemDustPlutonium238.name=钚 238粉
+item.itemDustTinyPlutonium238.name=小撮钚 238粉
+item.itemDustSmallPlutonium238.name=小堆钚 238粉
+item.itemNuggetPlutonium238.name=钚 238粒
+item.itemPlatePlutonium238.name=钚 238板
+item.itemPlateDoublePlutonium238.name=双重钚 238板
+item.itemIngotStrontium90.name=锶 90锭
+item.itemDustStrontium90.name=锶 90粉
+item.itemDustTinyStrontium90.name=小撮锶 90粉
+item.itemDustSmallStrontium90.name=小堆锶 90粉
+item.itemNuggetStrontium90.name=锶 90粒
+item.itemPlateStrontium90.name=锶 90板
+item.itemPlateDoubleStrontium90.name=双重锶 90板
+item.itemIngotPolonium210.name=钋 210锭
+item.itemDustPolonium210.name=钋 210粉
+item.itemDustTinyPolonium210.name=小撮钋 210粉
+item.itemDustSmallPolonium210.name=小堆钋 210粉
+item.itemNuggetPolonium210.name=钋 210粒
+item.itemPlatePolonium210.name=钋 210板
+item.itemPlateDoublePolonium210.name=双重钋 210板
+item.itemIngotAmericium241.name=镅 241锭
+item.itemDustAmericium241.name=镅 241粉
+item.itemDustTinyAmericium241.name=小撮镅 241粉
+item.itemDustSmallAmericium241.name=小堆镅 241粉
+item.itemNuggetAmericium241.name=镅 241粒
+item.itemPlateAmericium241.name=镅 241板
+item.itemPlateDoubleAmericium241.name=双重镅 241板
item.itemIngotSiliconCarbide.name=碳化硅锭
item.itemDustSiliconCarbide.name=碳化硅粉
item.itemDustTinySiliconCarbide.name=小撮碳化硅粉
@@ -766,7 +766,7 @@ item.itemPlateZeron100.name=塞龙-100板
item.itemPlateDoubleZeron100.name=双重塞龙-100板
item.itemBoltZeron100.name=塞龙-100螺栓
item.itemRodZeron100.name=塞龙-100杆
-item.itemRodLongZeron100.name=长塞龙-100杆
+item.itemRodLongZeron100.name=长塞龙100杆
item.itemRingZeron100.name=塞龙-100环
item.itemScrewZeron100.name=塞龙-100螺丝
item.itemRotorZeron100.name=塞龙-100转子
@@ -1477,18 +1477,18 @@ item.itemDustSmallCookedZrCl4.name=小堆焙烧过的氯化锆粉
item.itemDustTinyCookedZrCl4.name=小撮焙烧过的氯化锆粉
item.itemDustUN18Fertiliser.name=流体肥料UN-18粉
item.itemDustSmallUN18Fertiliser.name=小堆流体肥料UN-18粉
-item.itemDustTinyUN18Fertiliser.name=小撮流体肥料UN-18粉
+item.itemDustTinyUN18Fertiliser.name=小撮流体肥料un-18粉
item.itemDustUN32Fertiliser.name=流体肥料UN-32粉
item.itemDustSmallUN32Fertiliser.name=小堆流体肥料UN-32粉
item.itemDustTinyUN32Fertiliser.name=小撮流体肥料UN-32粉
-item.itemNuggetPlutonium239.name=钚-239粒
-item.itemCellPlutonium239.name=钚-239单元
-item.itemIngotPlutonium239.name=钚-239锭
-item.itemPlatePlutonium239.name=钚-239板
-item.itemPlateDoublePlutonium239.name=双重钚-239板
-item.itemDustPlutonium239.name=钚-239粉
-item.itemDustSmallPlutonium239.name=小堆钚-239粉
-item.itemDustTinyPlutonium239.name=小撮钚-239粉
+item.itemNuggetPlutonium239.name=钚 239粒
+item.itemCellPlutonium239.name=钚 239单元
+item.itemIngotPlutonium239.name=钚 239锭
+item.itemPlatePlutonium239.name=钚 239板
+item.itemPlateDoublePlutonium239.name=双重钚 239板
+item.itemDustPlutonium239.name=钚 239粉
+item.itemDustSmallPlutonium239.name=小堆钚 239粉
+item.itemDustTinyPlutonium239.name=小撮钚 239粉
//Multitools
@@ -1521,8 +1521,8 @@ item.OsmiumMultispade.name=锇复合铲
item.PalladiumMultipick.name=钯复合镐
item.PalladiumMultispade.name=钯复合铲
item.PlatinumMultispade.name=铂复合铲
-item.Plutonium241Multipick.name=钚-241复合镐
-item.Plutonium241Multispade.name=钚-241复合铲
+item.Plutonium241Multipick.name=钚 241复合镐
+item.Plutonium241Multispade.name=钚 241复合铲
item.SilverMultispade.name=银复合铲
item.ThoriumMultipick.name=钍复合镐
item.ThoriumMultispade.name=钍复合铲
@@ -1530,8 +1530,8 @@ item.TitaniumMultipick.name=钛复合镐
item.TitaniumMultispade.name=钛复合铲
item.TungstenMultipick.name=钨复合镐
item.TungstenMultispade.name=钨复合铲
-item.Uranium235Multipick.name=铀-235复合镐
-item.Uranium235Multispade.name=铀-235复合铲
+item.Uranium235Multipick.name=铀 235复合镐
+item.Uranium235Multispade.name=铀 235复合铲
item.DarkSteelMultipick.name=玄钢复合镐
item.DarkSteelMultispade.name=玄钢复合铲
item.DuraniumMultipick.name=铿铀复合镐
@@ -1727,7 +1727,7 @@ item.itemPlateVoid.name=虚空板
item.itemPlateDimensionShard.name=维度碎片板
item.rfEUBattery.name=通用充电电池
item.personalCloakingDevice.name=§9个人隐形装置§7
-item.personalHealingDevice.name=§9私人治疗纳米加速器§r
+item.personalHealingDevice.name=§9个人纳米治疗加速器§r
item.SlowBuildingRing.name=§e缓建指环§7
item.itemStaballoyPickaxe.name=隧道挖掘者
item.itemStaballoyAxe.name=树林砍伐者
@@ -1800,13 +1800,13 @@ tile.Block of Berkelium.name=锫块
tile.Block of Californium.name=锎块
tile.Block of Einsteinium.name=锿块
tile.Block of Fermium.name=镄块
-tile.Block of Thorium 232.name=钍-232块
-tile.Block of Uranium 232.name=铀-232块
-tile.Block of Uranium 233.name=铀-233块
-tile.Block of Plutonium-238.name=钚-238块
-tile.Block of Strontium-90.name=锶-90块
-tile.Block of Polonium-210.name=钋-210块
-tile.Block of Americium-241.name=镅-241块
+tile.Block of Thorium 232.name=钍232块
+tile.Block of Uranium 232.name=铀232块
+tile.Block of Uranium 233.name=铀233块
+tile.Block of Plutonium-238.name=钚238块
+tile.Block of Strontium-90.name=锶90块
+tile.Block of Polonium-210.name=钋210块
+tile.Block of Americium-241.name=镅241块
tile.Block of Silicon Carbide.name=碳化硅块
tile.Silicon Carbide Frame Box.name=碳化硅框架
tile.Block of Zirconium Carbide.name=碳化锆块
@@ -1973,10 +1973,10 @@ item.itemDustTinyPromethium.name=小撮钷粉
item.itemDustPromethium.name=钷粉
tile.Block of Promethium.name=钷块
-item.itemCellAmericium241.name=镅-241单元
-item.itemCellPolonium210.name=钋-210单元
-item.itemCellStrontium90.name=锶-90单元
-item.itemCellPlutonium238.name=钚-238单元
+item.itemCellAmericium241.name=镅 241单元
+item.itemCellPolonium210.name=钋 210单元
+item.itemCellStrontium90.name=锶 90单元
+item.itemCellPlutonium238.name=钚 238单元
entity.MiningCharge.name=采矿费用
entity.throwablePotionSulfuric.name=硫酸烧瓶
@@ -2316,7 +2316,7 @@ item.itemScrewChromaticGlass.name=彩色玻璃螺丝
item.itemRotorChromaticGlass.name=彩色玻璃转子
item.itemGearChromaticGlass.name=彩色玻璃齿轮
item.itemCellChromaticGlass.name=彩色玻璃单元
-tile.Block of Chromatic Glass.name=彩色玻璃块
+tile.Block of Chromatic Glass.name=彩色玻璃块
tile.Chromatic Glass Frame Box.name=彩色玻璃框架
item.itemIngotAstralTitanium.name=星体钛锭
@@ -2709,5 +2709,57 @@ tile.playerDoorIce.name=冰自动门
tile.playerDoorIron.name=铁自动门
tile.playerDoorWood.name=木自动门
-
-//This zh_CN.lang is translation by huajijam for GregTech++ (4/2/19) \ No newline at end of file
+//Added 4/2/19
+
+item.GTPP.BattPack.06.name=充电工具包[LuV]
+item.GTPP.BattPack.07.name=充电工具包[ZPM]
+item.GTPP.BattPack.08.name=充电工具包[UV]
+item.GTPP.BattPack.09.name=充电工具包[MAX]
+
+
+//Added 13/3/19
+item.gtpp.debug.scanner.name=GT++排错扫描器
+item.RawWaste.name=动物粪便单元
+item.ManureSlurry.name=粪浆单元
+item.FertileManureSlurry.name=肥沃的泥浆单元
+item.itemDustTinyDemicheleiteBr.name=小撮德米凯莱(Br)
+item.itemDustSmallDemicheleiteBr.name=小堆德米凯莱(Br)
+tile.blockPooCollector.name=农业下水道
+tile.Block of Lithium 7.name=锂7块
+
+//Added 14/3/19
+item.blood.name=血单元
+item.aniline.name=苯胺单元
+item.cadaverine.name=尸胺单元
+item.polyurethane.name=聚氨酯单元
+item.putrescine.name=腐胺单元
+item.cyclohexane.name=环己单元
+item.cyclohexanone.name=环己酮单元
+item.nitrobenzene.name=硝基苯单元
+item.ender.name=液体末影单元
+item.xpjuice.name=液体经验单元
+item.itemBombUnf.name=可投掷炸弹(未完成)
+item.itemBombCasing.name=炸弹框架
+item.gtpp.throwable.bomb.name=可投掷炸弹
+item.itemDetCable.name=炸弹保险丝
+tile.blockPooCollector.0.name=农业下水道
+tile.blockPooCollector.8.name=生物复合收集器
+item.itemIngotBakelite.name=电木锭
+item.itemDustBakelite.name=电木粉
+item.itemDustTinyBakelite.name=小撮电木粉
+item.itemDustSmallBakelite.name=小堆电木粉
+item.itemNuggetBakelite.name=电木粒
+item.itemPlateBakelite.name=电木板
+item.itemPlateDoubleBakelite.name=双重电木板
+item.itemCellBakelite.name=电木单元
+tile.Block of Bakelite.name=电木块
+item.itemIngotNylon.name=尼龙锭
+item.itemDustNylon.name=尼龙粉
+item.itemDustTinyNylon.name=小撮尼龙粉
+item.itemDustSmallNylon.name=小堆尼龙粉
+item.itemNuggetNylon.name=尼龙粒
+item.itemPlateNylon.name=尼龙板
+item.itemPlateDoubleNylon.name=双重尼龙板
+item.itemCellNylon.name=尼龙单元
+tile.Block of Nylon.name=尼龙块
+//This zh_CN.lang is translation by huajijam for GregTech++ (18/3/19) \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/aspects/Sagrausten.png b/src/resources/assets/miscutils/textures/aspects/Sagrausten.png
new file mode 100644
index 0000000000..a2c461f94e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/aspects/Sagrausten.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/aspects/Slusium.png b/src/resources/assets/miscutils/textures/aspects/Slusium.png
new file mode 100644
index 0000000000..fd2c42414d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/aspects/Slusium.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/aspects/Xablum.png b/src/resources/assets/miscutils/textures/aspects/Xablum.png
new file mode 100644
index 0000000000..a19d64039a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/aspects/Xablum.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/aspects/Xenil.png b/src/resources/assets/miscutils/textures/aspects/Xenil.png
new file mode 100644
index 0000000000..e3b5ecda82
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/aspects/Xenil.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/aspects/Zetralt.png b/src/resources/assets/miscutils/textures/aspects/Zetralt.png
new file mode 100644
index 0000000000..001edf8ea3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/aspects/Zetralt.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png
new file mode 100644
index 0000000000..a8e497ec01
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png
new file mode 100644
index 0000000000..34d35b44e3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png
new file mode 100644
index 0000000000..1754172689
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png
new file mode 100644
index 0000000000..4835240aee
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png
new file mode 100644
index 0000000000..8c5f1ec338
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png
new file mode 100644
index 0000000000..75ff7b2558
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png
new file mode 100644
index 0000000000..edcfc53edd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png
new file mode 100644
index 0000000000..8176e98807
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png
new file mode 100644
index 0000000000..0737748bb9
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png
new file mode 100644
index 0000000000..003d1597a6
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta
new file mode 100644
index 0000000000..4f0718ac96
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation": {}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png
new file mode 100644
index 0000000000..ef08c75bc8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta
new file mode 100644
index 0000000000..0645f48c62
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation": {
+ "frametime": 2
+ }
+}
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png
new file mode 100644
index 0000000000..b3b257e59c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png
new file mode 100644
index 0000000000..3d47ce434c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png
new file mode 100644
index 0000000000..2b99670ea1
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png
new file mode 100644
index 0000000000..e516903d26
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png
new file mode 100644
index 0000000000..97767a73c6
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png
new file mode 100644
index 0000000000..3147037815
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png
new file mode 100644
index 0000000000..dce530370f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png
new file mode 100644
index 0000000000..0c85939327
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png
new file mode 100644
index 0000000000..b3c3716abb
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png
new file mode 100644
index 0000000000..a9a9c6fcee
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png
index 28005f9c52..d96558c8f5 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png
index 4fa1301387..4d8f366b9c 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png
index 322292e225..e914a7c788 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bomb.png b/src/resources/assets/miscutils/textures/items/bomb.png
new file mode 100644
index 0000000000..e8e9b0f532
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bomb.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bomb_casing.png b/src/resources/assets/miscutils/textures/items/bomb_casing.png
new file mode 100644
index 0000000000..d4238babe2
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bomb_casing.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bomb_lit.png b/src/resources/assets/miscutils/textures/items/bomb_lit.png
new file mode 100644
index 0000000000..e40029160b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bomb_lit.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/bucket.generic.overlay.png b/src/resources/assets/miscutils/textures/items/bucket.generic.overlay.png
new file mode 100644
index 0000000000..1597a9cc4a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/bucket.generic.overlay.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/research/note.png b/src/resources/assets/miscutils/textures/items/research/note.png
new file mode 100644
index 0000000000..795eaeb193
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/research/note.png
Binary files differ