Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
 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
parent 735d81e42b 567394aced
commit 9413a399cd
102 changed files with 2046 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/bundles/bundle_tk.properties
View File

@@ -1543,6 +1543,7 @@ block.shielded-wall.name = Shielded Wall
block.radar.name = Radar
block.build-tower.name = Build Tower
block.regen-projector.name = Regen Projector
block.shockwave-tower.name = Shockwave Tower
block.shield-projector.name = Shield Projector
block.large-shield-projector.name = Large Shield Projector
block.armored-duct.name = Armored Duct
@@ -1606,7 +1607,8 @@ block.prime-refabricator.name = Prime Refabricator
block.unit-repair-tower.name = Unit Repair Tower
block.diffuse.name = Diffuse
block.basic-assembler-module.name = Basic Assembler Module
block.ravage.name = Ravage
block.smite.name = Smite
block.malign.name = Malign
block.switch.name = Switch
block.micro-processor.name = Micro Processor