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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-06-08 09:05:31 -04:00
parent b2353eba58 49c9841c87
commit 0793ba45b5
44 changed files with 134 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+2
View File
@@ -1961,6 +1961,8 @@ block.tungsten-wall-large.name = Large Tungsten Wall
block.blast-door.name = Blast Door block.blast-door.name = Blast Door
block.carbide-wall.name = Carbide Wall block.carbide-wall.name = Carbide Wall
block.carbide-wall-large.name = Large Carbide Wall block.carbide-wall-large.name = Large Carbide Wall
block.reinforced-surge-wall.name = Reinforced Surge Wall
block.reinforced-surge-wall-large.name = Large Reinforced Surge Wall
block.radar.name = Radar block.radar.name = Radar
block.build-tower.name = Build Tower block.build-tower.name = Build Tower
block.regen-projector.name = Regen Projector block.regen-projector.name = Regen Projector
core/assets/bundles/bundle_be.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_bg.properties
+3 -3
View File
@@ -1987,9 +1987,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_cs.properties
+3 -3
View File
@@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_da.properties
+3 -3
View File
@@ -1956,9 +1956,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_de.properties
+3 -3
View File
@@ -1994,9 +1994,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_es.properties
+3 -3
View File
@@ -1996,9 +1996,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricador block.fabricator.name = Fabricador
block.tank-reconstructor.name = Reconstructor de Tanques block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Reconstructor de Mechs block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Reconstructor de Naves block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Ensamblador de Tanques block.tank-assembler.name = Ensamblador de Tanques
block.ship-assembler.name = Ensamblador de Naves block.ship-assembler.name = Ensamblador de Naves
block.mech-assembler.name = Ensamblador de Mechs block.mech-assembler.name = Ensamblador de Mechs
core/assets/bundles/bundle_et.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_eu.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_fi.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_fil.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_fr.properties
+3 -3
View File
@@ -2005,9 +2005,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_hu.properties
+3 -3
View File
@@ -1969,9 +1969,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_id_ID.properties
+3 -3
View File
@@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabrikator block.fabricator.name = Fabrikator
block.tank-reconstructor.name = Rekonstruksi Tank block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Rekonstruksi Mech block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Rekonstruksi Kapal block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Perakitan Tank block.tank-assembler.name = Perakitan Tank
block.ship-assembler.name = Perakitan Kapal block.ship-assembler.name = Perakitan Kapal
block.mech-assembler.name = Perakitan Mech block.mech-assembler.name = Perakitan Mech
core/assets/bundles/bundle_it.properties
+3 -3
View File
@@ -1967,9 +1967,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_ja.properties
+3 -3
View File
@@ -1975,9 +1975,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_ko.properties
+3 -3
View File
@@ -1995,9 +1995,9 @@ block.sublimate.name = 서브리메이트
block.titan.name = 티탄 block.titan.name = 티탄
block.disperse.name = 디스퍼스 block.disperse.name = 디스퍼스
block.fabricator.name = 조립기 block.fabricator.name = 조립기
block.tank-reconstructor.name = 전차 재구성기 block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = 기갑 재구성기 block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = 함선 재구성기 block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = 전차 조립대 block.tank-assembler.name = 전차 조립대
block.ship-assembler.name = 함선 조립대 block.ship-assembler.name = 함선 조립대
block.mech-assembler.name = 기갑 조립대 block.mech-assembler.name = 기갑 조립대
core/assets/bundles/bundle_lt.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_nl.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_nl_BE.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_pl.properties
+3 -3
View File
@@ -1989,9 +1989,9 @@ block.sublimate.name = Sublimizator
block.titan.name = Tytan block.titan.name = Tytan
block.disperse.name = Rozpraszacz block.disperse.name = Rozpraszacz
block.fabricator.name = Fabrikator block.fabricator.name = Fabrikator
block.tank-reconstructor.name = Konstruktor Czołgów block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Konstruktor Mechów block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Konstruktor Statków block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Monter Czołgów block.tank-assembler.name = Monter Czołgów
block.ship-assembler.name = Monter Statków block.ship-assembler.name = Monter Statków
block.mech-assembler.name = Monter Mechów block.mech-assembler.name = Monter Mechów
core/assets/bundles/bundle_pt_BR.properties
+3 -3
View File
@@ -1967,9 +1967,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_pt_PT.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_ro.properties
+3 -3
View File
@@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_ru.properties
+3 -3
View File
@@ -1994,9 +1994,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_sr.properties
+3 -3
View File
@@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_sv.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_th.properties
+3 -3
View File
@@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_tk.properties
+3 -3
View File
@@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_tr.properties
+3 -3
View File
@@ -1996,9 +1996,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabrikatör block.fabricator.name = Fabrikatör
block.tank-reconstructor.name = Tank Yeniden Yapılandırıcı block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Robot Yeniden Yapılandırıcı block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Gemi Yeniden Yapılandırıcı block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank İnşaatcı block.tank-assembler.name = Tank İnşaatcı
block.ship-assembler.name = Gemi İnşaatcı block.ship-assembler.name = Gemi İnşaatcı
block.mech-assembler.name = Robot İnşaatcı block.mech-assembler.name = Robot İnşaatcı
core/assets/bundles/bundle_uk_UA.properties
+3 -3
View File
@@ -1951,9 +1951,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_vi.properties
+3 -3
View File
@@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate
block.titan.name = Titan block.titan.name = Titan
block.disperse.name = Disperse block.disperse.name = Disperse
block.fabricator.name = Fabricator block.fabricator.name = Fabricator
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = Tank Assembler block.tank-assembler.name = Tank Assembler
block.ship-assembler.name = Ship Assembler block.ship-assembler.name = Ship Assembler
block.mech-assembler.name = Mech Assembler block.mech-assembler.name = Mech Assembler
core/assets/bundles/bundle_zh_CN.properties
+3 -3
View File
@@ -1994,9 +1994,9 @@ block.sublimate.name = 升华
block.titan.name = 泰坦 block.titan.name = 泰坦
block.disperse.name = 驱离 block.disperse.name = 驱离
block.fabricator.name = 制造厂 block.fabricator.name = 制造厂
block.tank-reconstructor.name = Tank Reconstructor block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = Mech Reconstructor block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = Ship Reconstructor block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = 坦克装配厂 block.tank-assembler.name = 坦克装配厂
block.ship-assembler.name = 飞船装配厂 block.ship-assembler.name = 飞船装配厂
block.mech-assembler.name = 机甲装配厂 block.mech-assembler.name = 机甲装配厂
core/assets/bundles/bundle_zh_TW.properties
+3 -3
View File
@@ -1995,9 +1995,9 @@ block.sublimate.name = 昇華
block.titan.name = 泰坦 block.titan.name = 泰坦
block.disperse.name = 驅離 block.disperse.name = 驅離
block.fabricator.name = 製造廠 block.fabricator.name = 製造廠
block.tank-reconstructor.name = 坦克重塑者 block.tank-refabricator.name = Tank Refabricator
block.mech-reconstructor.name = 機甲重塑者 block.mech-refabricator.name = Mech Refabricator
block.ship-reconstructor.name = 船隻重塑者 block.ship-refabricator.name = Ship Refabricator
block.tank-assembler.name = 坦克裝配者 block.tank-assembler.name = 坦克裝配者
block.ship-assembler.name = 船隻裝配者 block.ship-assembler.name = 船隻裝配者
block.mech-assembler.name = 機甲裝配者 block.mech-assembler.name = 機甲裝配者
core/assets/contributors
+1
View File
@@ -138,3 +138,4 @@ Jerzy Paciorkiewicz
YozoZChomutova YozoZChomutova
Qendolin Qendolin
Goobrr Goobrr
[Error_27]
core/src/mindustry/entities/comp/BuildingComp.java
+2 -2
View File
@@ -1108,7 +1108,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
} }
public void drawCracks(){ public void drawCracks(){
if(!damaged() || block.size > BlockRenderer.maxCrackSize) return; if(!block.drawCracks || !damaged() || block.size > BlockRenderer.maxCrackSize) return;
int id = pos(); int id = pos();
TextureRegion region = renderer.blocks.cracks[block.size - 1][Mathf.clamp((int)((1f - healthf()) * BlockRenderer.crackRegions), 0, BlockRenderer.crackRegions-1)]; TextureRegion region = renderer.blocks.cracks[block.size - 1][Mathf.clamp((int)((1f - healthf()) * BlockRenderer.crackRegions), 0, BlockRenderer.crackRegions-1)];
Draw.colorl(0.2f, 0.1f + (1f - healthf())* 0.6f); Draw.colorl(0.2f, 0.1f + (1f - healthf())* 0.6f);
@@ -1322,7 +1322,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
Damage.dynamicExplosion(x, y, flammability, explosiveness * 3.5f, power, tilesize * block.size / 2f, state.rules.damageExplosions, block.destroyEffect); Damage.dynamicExplosion(x, y, flammability, explosiveness * 3.5f, power, tilesize * block.size / 2f, state.rules.damageExplosions, block.destroyEffect);
if(!floor().solid && !floor().isLiquid){ if(block.createRubble && !floor().solid && !floor().isLiquid){
Effect.rubble(x, y, block.size); Effect.rubble(x, y, block.size);
} }
} }
core/src/mindustry/ui/fragments/PlacementFragment.java
+1 -1
View File
@@ -547,7 +547,7 @@ public class PlacementFragment{
} }
Seq<Block> getByCategory(Category cat){ Seq<Block> getByCategory(Category cat){
return returnArray.selectFrom(content.blocks(), block -> block.category == cat && block.isVisible()); return returnArray.selectFrom(content.blocks(), block -> block.category == cat && block.isVisible() && block.environmentBuildable());
} }
Seq<Block> getUnlockedByCategory(Category cat){ Seq<Block> getUnlockedByCategory(Category cat){
core/src/mindustry/world/Block.java
+4
View File
@@ -166,6 +166,10 @@ public class Block extends UnlockableContent implements Senseable{
public float baseExplosiveness = 0f; public float baseExplosiveness = 0f;
/** bullet that this block spawns when destroyed */ /** bullet that this block spawns when destroyed */
public @Nullable BulletType destroyBullet = null; public @Nullable BulletType destroyBullet = null;
/** whether cracks are drawn when this block is damaged */
public boolean drawCracks = true;
/** whether rubble is created when this block is destroyed */
public boolean createRubble = true;
/** whether this block can be placed on edges of liquids. */ /** whether this block can be placed on edges of liquids. */
public boolean floating = false; public boolean floating = false;
/** multiblock size */ /** multiblock size */
core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
+1
View File
@@ -80,6 +80,7 @@ public class PayloadMassDriver extends PayloadBlock{
stats.add(Stat.payloadCapacity, StatValues.squared(maxPayloadSize, StatUnit.blocksSquared)); stats.add(Stat.payloadCapacity, StatValues.squared(maxPayloadSize, StatUnit.blocksSquared));
stats.add(Stat.reload, 60f / (chargeTime + reload), StatUnit.seconds); stats.add(Stat.reload, 60f / (chargeTime + reload), StatUnit.seconds);
stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks);
} }
@Override @Override
core/src/mindustry/world/blocks/power/BeamNode.java
+7
View File
@@ -48,6 +48,13 @@ public class BeamNode extends PowerBlock{
addBar("batteries", PowerNode.makeBatteryBalance()); addBar("batteries", PowerNode.makeBatteryBalance());
} }
@Override
public void setStats(){
super.setStats();
stats.add(Stat.powerRange, range, StatUnit.blocks);
}
@Override @Override
public void init(){ public void init(){
super.init(); super.init();
core/src/mindustry/world/blocks/production/BeamDrill.java
+6
View File
@@ -5,9 +5,11 @@ import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.units.*; import mindustry.entities.units.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
@@ -15,6 +17,7 @@ import mindustry.graphics.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.environment.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -102,6 +105,9 @@ public class BeamDrill extends Block{
public void setStats(){ public void setStats(){
super.setStats(); super.setStats();
stats.add(Stat.drillTier, StatValues.blocks(b -> (b instanceof Floor f && f.wallOre && f.itemDrop != null && f.itemDrop.hardness <= tier) || (b instanceof StaticWall w && w.itemDrop != null && w.itemDrop.hardness <= tier)));
stats.add(Stat.drillSpeed, 60f / drillTime * size, StatUnit.itemsSecond);
if(optionalBoostIntensity != 1){ if(optionalBoostIntensity != 1){
stats.add(Stat.boostEffect, optionalBoostIntensity, StatUnit.timesSpeed); stats.add(Stat.boostEffect, optionalBoostIntensity, StatUnit.timesSpeed);
} }
core/src/mindustry/world/blocks/production/WallCrafter.java
+1
View File
@@ -64,6 +64,7 @@ public class WallCrafter extends Block{
stats.add(Stat.output, output); stats.add(Stat.output, output);
stats.add(Stat.tiles, StatValues.blocks(attribute, floating, 1f, true, false)); stats.add(Stat.tiles, StatValues.blocks(attribute, floating, 1f, true, false));
stats.add(Stat.drillSpeed, 60f / drillTime * size);
} }
@Override @Override
core/src/mindustry/world/blocks/units/RepairTower.java
+9
View File
@@ -11,6 +11,7 @@ import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.logic.*; import mindustry.logic.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -29,6 +30,14 @@ public class RepairTower extends Block{
solid = true; solid = true;
} }
@Override
public void setStats(){
super.setStats();
stats.add(Stat.range, range, StatUnit.blocks);
stats.add(Stat.repairSpeed, healAmount * 60f, StatUnit.perSecond);
}
@Override @Override
public void drawPlace(int x, int y, int rotation, boolean valid){ public void drawPlace(int x, int y, int rotation, boolean valid){
super.drawPlace(x, y, rotation, valid); super.drawPlace(x, y, rotation, valid);
core/src/mindustry/world/meta/StatValues.java
+1 -1
View File
@@ -204,7 +204,7 @@ public class StatValues{
for(int i = 0; i < list.size; i++){ for(int i = 0; i < list.size; i++){
var item = list.get(i); var item = list.get(i);
if(item instanceof Block block && block.itemDrop != null && !block.itemDrop.unlocked()) continue; if(item instanceof Block block && block.itemDrop != null && !block.itemDrop.unlockedNow()) continue;
if(item.uiIcon.found()) l.image(item.uiIcon).size(iconSmall).padRight(2).padLeft(2).padTop(3).padBottom(3); if(item.uiIcon.found()) l.image(item.uiIcon).size(iconSmall).padRight(2).padLeft(2).padTop(3).padBottom(3);
l.add(item.localizedName).left().padLeft(1).padRight(4).colspan(item.uiIcon.found() ? 1 : 2); l.add(item.localizedName).left().padLeft(1).padRight(4).colspan(item.uiIcon.found() ? 1 : 2);