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

 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
This commit is contained in:
Epowerj
2022-07-11 17:14:39 -04:00
102 changed files with 2046 additions and 1465 deletions

View File

@@ -1558,6 +1558,7 @@ block.shielded-wall.name = Shielded Wall
block.radar.name = Radar
block.build-tower.name = İnşa Kulesi
block.regen-projector.name = Tamir Projektörü
block.shockwave-tower.name = Shockwave Tower
block.shield-projector.name = Kalkan Projektörü
block.large-shield-projector.name = Büyük Kalkan Projektörü
block.armored-duct.name = Zırhlı Tüp
@@ -1621,7 +1622,8 @@ block.prime-refabricator.name = Birincil Yeniden Yapılandırma Fabrikatörü
block.unit-repair-tower.name = Birim Tamir Kulesi
block.diffuse.name = Diffuse
block.basic-assembler-module.name = Basit İnşa Modülü
block.ravage.name = Ravage
block.smite.name = Smite
block.malign.name = Malign
#ama tüp ne aga -Anti Dragon
block.switch.name = Düğme
block.micro-processor.name = Mikro İşlemci