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
@@ -1556,6 +1556,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 = 装甲管道
@@ -1619,7 +1620,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 = 微型处理器