Merge branch 'master' into bassAdditions

10 files changed, 21 insertions, 1 deletions

diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 20160069e4..ccb17a8a0c 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -4,8 +4,10 @@ tile.quantumStuff.name=Quantum Stuff
 item.em.debugContainer.name=Debug EM Container
 item.em.definitionContainer.name=EM Recipe Hint
 item.em.definitionScanStorage.name=EM Scan Storage
-item.em.debugBuilder.name=Multiblock Machine Blueprint
+item.em.constructable.name=Multiblock Machine Blueprint
+item.em.frontRotate.name=Front Rotation Scrench
 item.em.parametrizerMemoryCard.name=Parametrizer Memory Card
+item.em.EuMeterGT.name=GT EU meter
 
 death.attack.microwaving=%1$s was dehydrated by radiation.
 death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s.
diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang
new file mode 100644
index 0000000000..5359f04e9b
--- /dev/null
+++ b/src/main/resources/assets/tectech/lang/zh_CN.lang
@@ -0,0 +1,13 @@
+itemGroup.TecTech=泛次元钛克科技黑洞研究所
+tile.quantumGlass.name=量子玻璃
+tile.quantumStuff.name=量子物质
+item.em.debugContainer.name=调试用 EM容器
+item.em.definitionContainer.name=EM配方指引
+item.em.debugBuilder.name=多方块机器蓝图
+item.em.parametrizerMemoryCard.name=参量机记忆卡
+
+death.attack.microwaving=%1$s 被辐射脱水
+death.attack.microwaving.player=%1$s 在与 %2$s 战斗中被辐射脱水
+
+death.attack.elementalPollution=%1$s 被蒸发了
+death.attack.elementalPollution.player=%1$s 在与 %2$s 战斗中被蒸发了
diff --git a/src/main/resources/assets/tectech/sounds.json b/src/main/resources/assets/tectech/sounds.json
index c4049f5f02..e23f1c1196 100644
--- a/src/main/resources/assets/tectech/sounds.json
+++ b/src/main/resources/assets/tectech/sounds.json
@@ -4,6 +4,11 @@
     "subtitle": "tectech.subtitle.microwave_ding",
     "sounds": [{"name": "microwave_ding","stream": false}]
   },
+  "fx_scan": {
+    "category": "block",
+    "subtitle": "tectech.subtitle.fx_scan",
+    "sounds": [{"name": "fx_scan","stream": false}]
+  },
   "fx_alarm": {
     "category": "block",
     "subtitle": "tectech.subtitle.fx_alarm",
diff --git a/src/main/resources/assets/tectech/sounds/fx_scan.ogg b/src/main/resources/assets/tectech/sounds/fx_scan.ogg
new file mode 100644
index 0000000000..0b50e0ca76
--- /dev/null
+++ b/src/main/resources/assets/tectech/sounds/fx_scan.ogg
diff --git a/src/main/resources/assets/tectech/textures/gui/assLineRender.png b/src/main/resources/assets/tectech/textures/gui/assLineRender.png
new file mode 100644
index 0000000000..cc1cd35a7d
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/gui/assLineRender.png
diff --git a/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png b/src/main/resources/assets/tectech/textures/items/itemConstructable.png
index dd2b6911c9..dd2b6911c9 100644
--- a/src/main/resources/assets/tectech/textures/items/itemDebugBuilder.png
+++ b/src/main/resources/assets/tectech/textures/items/itemConstructable.png
diff --git a/src/main/resources/assets/tectech/textures/items/itemEuMeterGT.png b/src/main/resources/assets/tectech/textures/items/itemEuMeterGT.png
new file mode 100644
index 0000000000..a3297c5dd4
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemEuMeterGT.png
diff --git a/src/main/resources/assets/tectech/textures/items/itemFrontRotate.png b/src/main/resources/assets/tectech/textures/items/itemFrontRotate.png
new file mode 100644
index 0000000000..2d5d2b2ad9
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemFrontRotate.png
diff --git a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png
index 0ef5e35895..2bdbb54ab7 100644
--- a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png
+++ b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardLocked.png
diff --git a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png
index 1a4c0dc9bc..b61a1725af 100644
--- a/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png
+++ b/src/main/resources/assets/tectech/textures/items/itemParametrizerMemoryCardUnlocked.png