Merge branch 'master' of https://github.com/Anuken/Mindustry into maps

Conflicts: core/assets/bundles/bundle_fi.properties core/assets/bundles/bundle_th.properties
2022-07-11 17:14:39 -04:00
parent 735d81e42b 567394aced
commit 9413a399cd
102 changed files with 2046 additions and 1465 deletions
@@ -1565,6 +1565,7 @@ block.shielded-wall.name = 護盾牆
 block.radar.name = 雷逹
 block.build-tower.name = 建造塔
 block.regen-projector.name = 再生投影儀
+block.shockwave-tower.name = Shockwave Tower
 block.shield-projector.name = 護盾投影儀
 block.large-shield-projector.name = 大型護盾投影儀
 block.armored-duct.name = 裝甲真空管
@@ -1628,7 +1629,8 @@ block.prime-refabricator.name = 高級單位重塑者
 block.unit-repair-tower.name = 維修塔
 block.diffuse.name = 擴散
 block.basic-assembler-module.name = 支援組裝廠
-block.ravage.name = Ravage
+block.smite.name = Smite
+block.malign.name = Malign

 block.switch.name = 按鈕
 block.micro-processor.name = 微處理器