aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorbasdxz <tudurap.com@gmail.com>2021-12-02 18:07:46 +0000
committerGitHub <noreply@github.com>2021-12-02 18:07:46 +0000
commit82887fba640debaae12e73bf2d6cf68ae0f6973a (patch)
tree5a2555bf923d95e71628b9e41e4d1b60f903bde1 /src/main/resources
parent8976b9cfa7beb1ecb5a4517d6b5a292c2ca9445c (diff)
parent61fe53085f5580b8313a5e598a5a3a0a1ca7d681 (diff)
downloadGT5-Unofficial-82887fba640debaae12e73bf2d6cf68ae0f6973a.tar.gz
GT5-Unofficial-82887fba640debaae12e73bf2d6cf68ae0f6973a.tar.bz2
GT5-Unofficial-82887fba640debaae12e73bf2d6cf68ae0f6973a.zip
Merge branch 'GTNewHorizons:master' into master
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang6
-rw-r--r--src/main/resources/assets/tectech/lang/zh_CN.lang11
2 files changed, 8 insertions, 9 deletions
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 668f010410..adec911faa 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -313,9 +313,9 @@ gt.blockmachines.hatch.dynamomulti64.tier.11.name=UIV 64A Dynamo Hatch
gt.blockmachines.hatch.dynamomulti04.tier.12.name=UMV 4A Dynamo Hatch
gt.blockmachines.hatch.dynamomulti16.tier.12.name=UMV 16A Dynamo Hatch
gt.blockmachines.hatch.dynamomulti64.tier.12.name=UMV 64A Dynamo Hatch
-gt.blockmachines.hatch.dynamomulti04.tier.13.name=IV 4A Dynamo Hatch
-gt.blockmachines.hatch.dynamomulti16.tier.13.name=IV 16A Dynamo Hatch
-gt.blockmachines.hatch.dynamomulti64.tier.13.name=IV 64A Dynamo Hatch
+gt.blockmachines.hatch.dynamomulti04.tier.13.name=UXV 4A Dynamo Hatch
+gt.blockmachines.hatch.dynamomulti16.tier.13.name=UXV 16A Dynamo Hatch
+gt.blockmachines.hatch.dynamomulti64.tier.13.name=UXV 64A Dynamo Hatch
gt.blockmachines.hatch.dynamomulti.desc.0=Multiple Ampere Energy Extractor for Multiblocks
gt.blockmachines.hatch.dynamomulti.desc.1=Amperes Out
diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang
index 72fc8845b5..2d594ffb8e 100644
--- a/src/main/resources/assets/tectech/lang/zh_CN.lang
+++ b/src/main/resources/assets/tectech/lang/zh_CN.lang
@@ -50,8 +50,8 @@ item.em.EuMeterGT.desc.1=只需右键方块.
item.em.frontRotate.name=正面旋转扳手
item.em.frontRotate.desc.0=触发正面旋转界面
-item.em.frontRotate.desc.1=仅旋转前面板,
-item.em.frontRotate.desc.2=允许结构旋转.
+item.em.frontRotate.desc.1=可以旋转多方块控制器,
+item.em.frontRotate.desc.2=从而使整个结构可以旋转.
item.em.parametrizerMemoryCard.name=数据化储存卡
item.em.parametrizerMemoryCard.desc.0=存储参数
@@ -313,9 +313,9 @@ gt.blockmachines.hatch.dynamomulti64.tier.11.name=64安UIV动力仓
gt.blockmachines.hatch.dynamomulti04.tier.12.name=4安UMV动力仓
gt.blockmachines.hatch.dynamomulti16.tier.12.name=16安UMV动力仓
gt.blockmachines.hatch.dynamomulti64.tier.12.name=64安UMV动力仓
-gt.blockmachines.hatch.dynamomulti04.tier.13.name=4安IV动力仓
-gt.blockmachines.hatch.dynamomulti16.tier.13.name=16安IV动力仓
-gt.blockmachines.hatch.dynamomulti64.tier.13.name=64安IV动力仓
+gt.blockmachines.hatch.dynamomulti04.tier.13.name=4安UXV动力仓
+gt.blockmachines.hatch.dynamomulti16.tier.13.name=16安UXV动力仓
+gt.blockmachines.hatch.dynamomulti64.tier.13.name=64安UXV动力仓
gt.blockmachines.hatch.dynamomulti.desc.0=从多方块机器以高电流输出能源
gt.blockmachines.hatch.dynamomulti.desc.1=输出电流
@@ -875,4 +875,3 @@ tt.keyphrase.Side_capabilities=辅助功能
#OpenTurrets compatibility
tile.turretHeadEM.name=元物质炮塔
tile.turretBaseEM.name=元物质炮塔基座
-© 2021 GitHub, Inc.