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

@@ -1565,6 +1565,7 @@ block.shielded-wall.name = Shielded Wall
block.radar.name = Radar
block.build-tower.name = Menara Pembangunan
block.regen-projector.name = Proyektor Penyembuhan
block.shockwave-tower.name = Shockwave Tower
block.shield-projector.name = Proyektor Pelindung
block.large-shield-projector.name = Proyektor Pelindung Besar
block.armored-duct.name = Pipa Lapis Baja
@@ -1628,7 +1629,8 @@ block.prime-refabricator.name = Refabrikator Perdana
block.unit-repair-tower.name = Menara Perbaikan Unit
block.diffuse.name = Membaur
block.basic-assembler-module.name = Modul Perakitan Dasar
block.ravage.name = Ravage
block.smite.name = Smite
block.malign.name = Malign
block.switch.name = Saklar
block.micro-processor.name = Prosesor Mikro