From 91643d94c41cae87139d168e9041bff668bddb82 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 8 Jun 2022 12:58:35 +0000 Subject: [PATCH 1/5] Automatic bundle update --- core/assets/bundles/bundle_be.properties | 6 +++--- core/assets/bundles/bundle_bg.properties | 6 +++--- core/assets/bundles/bundle_cs.properties | 6 +++--- core/assets/bundles/bundle_da.properties | 6 +++--- core/assets/bundles/bundle_de.properties | 6 +++--- core/assets/bundles/bundle_es.properties | 6 +++--- core/assets/bundles/bundle_et.properties | 6 +++--- core/assets/bundles/bundle_eu.properties | 6 +++--- core/assets/bundles/bundle_fi.properties | 6 +++--- core/assets/bundles/bundle_fil.properties | 6 +++--- core/assets/bundles/bundle_fr.properties | 6 +++--- core/assets/bundles/bundle_hu.properties | 6 +++--- core/assets/bundles/bundle_id_ID.properties | 6 +++--- core/assets/bundles/bundle_it.properties | 6 +++--- core/assets/bundles/bundle_ja.properties | 6 +++--- core/assets/bundles/bundle_ko.properties | 6 +++--- core/assets/bundles/bundle_lt.properties | 6 +++--- core/assets/bundles/bundle_nl.properties | 6 +++--- core/assets/bundles/bundle_nl_BE.properties | 6 +++--- core/assets/bundles/bundle_pl.properties | 6 +++--- core/assets/bundles/bundle_pt_BR.properties | 6 +++--- core/assets/bundles/bundle_pt_PT.properties | 6 +++--- core/assets/bundles/bundle_ro.properties | 6 +++--- core/assets/bundles/bundle_ru.properties | 6 +++--- core/assets/bundles/bundle_sr.properties | 6 +++--- core/assets/bundles/bundle_sv.properties | 6 +++--- core/assets/bundles/bundle_th.properties | 6 +++--- core/assets/bundles/bundle_tk.properties | 6 +++--- core/assets/bundles/bundle_tr.properties | 6 +++--- core/assets/bundles/bundle_uk_UA.properties | 6 +++--- core/assets/bundles/bundle_vi.properties | 6 +++--- core/assets/bundles/bundle_zh_CN.properties | 6 +++--- core/assets/bundles/bundle_zh_TW.properties | 6 +++--- 33 files changed, 99 insertions(+), 99 deletions(-) diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index 2fe285354c..d7b3bb46b7 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index f8506aff0f..21b1af1ecb 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -1987,9 +1987,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 7d1578a24f..1c2a26ba90 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index 0f3b8dff2d..bd57b6d68c 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -1956,9 +1956,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index e8393a4c93..ea3795f678 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1994,9 +1994,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index cbe4805efe..592d54c3f7 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1996,9 +1996,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricador -block.tank-reconstructor.name = Reconstructor de Tanques -block.mech-reconstructor.name = Reconstructor de Mechs -block.ship-reconstructor.name = Reconstructor de Naves +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Ensamblador de Tanques block.ship-assembler.name = Ensamblador de Naves block.mech-assembler.name = Ensamblador de Mechs diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index f3c823166b..959f0aa763 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 3cbe4a70ac..ccc45ab4b7 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index ba87eace6b..5d41ab18d2 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index 233744f363..ca89fba007 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index dc523096b1..54d28eda83 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -2005,9 +2005,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index d425c361d9..894706bcda 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -1969,9 +1969,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties index ab0c188cb8..1a4484c38c 100644 --- a/core/assets/bundles/bundle_id_ID.properties +++ b/core/assets/bundles/bundle_id_ID.properties @@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabrikator -block.tank-reconstructor.name = Rekonstruksi Tank -block.mech-reconstructor.name = Rekonstruksi Mech -block.ship-reconstructor.name = Rekonstruksi Kapal +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Perakitan Tank block.ship-assembler.name = Perakitan Kapal block.mech-assembler.name = Perakitan Mech diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 9c28f89653..2075950253 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -1967,9 +1967,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 47308fb825..a7d47e8d2e 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -1975,9 +1975,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 7281d45437..3e43509397 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1995,9 +1995,9 @@ block.sublimate.name = 서브리메이트 block.titan.name = 티탄 block.disperse.name = 디스퍼스 block.fabricator.name = 조립기 -block.tank-reconstructor.name = 전차 재구성기 -block.mech-reconstructor.name = 기갑 재구성기 -block.ship-reconstructor.name = 함선 재구성기 +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = 전차 조립대 block.ship-assembler.name = 함선 조립대 block.mech-assembler.name = 기갑 조립대 diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index 3bd3add49c..55c954e498 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 6004cf2eb7..33b2a61e35 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 36a7202d6c..a4ef21e23d 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index a108a5bbe3..74e03c0e7c 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -1989,9 +1989,9 @@ block.sublimate.name = Sublimizator block.titan.name = Tytan block.disperse.name = Rozpraszacz block.fabricator.name = Fabrikator -block.tank-reconstructor.name = Konstruktor Czołgów -block.mech-reconstructor.name = Konstruktor Mechów -block.ship-reconstructor.name = Konstruktor Statków +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Monter Czołgów block.ship-assembler.name = Monter Statków block.mech-assembler.name = Monter Mechów diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 04441e1668..9439772fc8 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -1967,9 +1967,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index f0428e80e0..6ba9506bfb 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index a7181092c8..266cf21600 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 2a61642e00..41a66887de 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -1994,9 +1994,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties index e17464a208..eb0e194099 100644 --- a/core/assets/bundles/bundle_sr.properties +++ b/core/assets/bundles/bundle_sr.properties @@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 7b70203363..aac2410c1d 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index c95dbb826f..27d92745e3 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 8f7b15e4e3..1a28471607 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -1958,9 +1958,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 81636f2f3d..bfe2c932c0 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -1996,9 +1996,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabrikatör -block.tank-reconstructor.name = Tank Yeniden Yapılandırıcı -block.mech-reconstructor.name = Robot Yeniden Yapılandırıcı -block.ship-reconstructor.name = Gemi Yeniden Yapılandırıcı +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank İnşaatcı block.ship-assembler.name = Gemi İnşaatcı block.mech-assembler.name = Robot İnşaatcı diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 89c1526bde..f3763f0238 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -1951,9 +1951,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index 56e0d42ebe..e18725482a 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -1995,9 +1995,9 @@ block.sublimate.name = Sublimate block.titan.name = Titan block.disperse.name = Disperse block.fabricator.name = Fabricator -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = Tank Assembler block.ship-assembler.name = Ship Assembler block.mech-assembler.name = Mech Assembler diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index c3ad9d7d4b..91186a6f02 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1994,9 +1994,9 @@ block.sublimate.name = 升华 block.titan.name = 泰坦 block.disperse.name = 驱离 block.fabricator.name = 制造厂 -block.tank-reconstructor.name = Tank Reconstructor -block.mech-reconstructor.name = Mech Reconstructor -block.ship-reconstructor.name = Ship Reconstructor +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = 坦克装配厂 block.ship-assembler.name = 飞船装配厂 block.mech-assembler.name = 机甲装配厂 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index a24c7875e4..08cbe328ea 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -1995,9 +1995,9 @@ block.sublimate.name = 昇華 block.titan.name = 泰坦 block.disperse.name = 驅離 block.fabricator.name = 製造廠 -block.tank-reconstructor.name = 坦克重塑者 -block.mech-reconstructor.name = 機甲重塑者 -block.ship-reconstructor.name = 船隻重塑者 +block.tank-refabricator.name = Tank Refabricator +block.mech-refabricator.name = Mech Refabricator +block.ship-refabricator.name = Ship Refabricator block.tank-assembler.name = 坦克裝配者 block.ship-assembler.name = 船隻裝配者 block.mech-assembler.name = 機甲裝配者 From 81753047ebc4fe95f6397490ac5388b964e58df9 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Wed, 8 Jun 2022 05:58:53 -0700 Subject: [PATCH 2/5] drawCracks and createRubble (#6989) --- core/src/mindustry/entities/comp/BuildingComp.java | 4 ++-- core/src/mindustry/world/Block.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 67bb98165b..77b5da267b 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1108,7 +1108,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } public void drawCracks(){ - if(!damaged() || block.size > BlockRenderer.maxCrackSize) return; + if(!block.drawCracks || !damaged() || block.size > BlockRenderer.maxCrackSize) return; int id = pos(); 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); @@ -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); - if(!floor().solid && !floor().isLiquid){ + if(block.createRubble && !floor().solid && !floor().isLiquid){ Effect.rubble(x, y, block.size); } } diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 827782cd85..cee89e4d1c 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -166,6 +166,10 @@ public class Block extends UnlockableContent implements Senseable{ public float baseExplosiveness = 0f; /** bullet that this block spawns when destroyed */ 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. */ public boolean floating = false; /** multiblock size */ From 77a8cfa89423365a73256c57307e36b7af358447 Mon Sep 17 00:00:00 2001 From: Garen7 <22408776+Garen7@users.noreply.github.com> Date: Wed, 8 Jun 2022 09:02:39 -0400 Subject: [PATCH 3/5] Changes how building selection keybindings are generated (#6916) Co-authored-by: Garen7 --- core/src/mindustry/ui/fragments/PlacementFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 73de5aa17a..121137b274 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -547,7 +547,7 @@ public class PlacementFragment{ } Seq 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 getUnlockedByCategory(Category cat){ From 1b9089aa3096151c3ac3c9c992163254c7381da5 Mon Sep 17 00:00:00 2001 From: ErrorInCode <43973418+Error-In-Code@users.noreply.github.com> Date: Wed, 8 Jun 2022 09:03:37 -0400 Subject: [PATCH 4/5] Stats for New Blocks (#6913) * Stats added * Fix bug + add WallCrafter speed * Add more stats * Update contributors --- core/assets/contributors | 1 + .../world/blocks/payloads/PayloadMassDriver.java | 1 + core/src/mindustry/world/blocks/power/BeamNode.java | 7 +++++++ .../src/mindustry/world/blocks/production/BeamDrill.java | 6 ++++++ .../mindustry/world/blocks/production/WallCrafter.java | 1 + core/src/mindustry/world/blocks/units/RepairTower.java | 9 +++++++++ core/src/mindustry/world/meta/StatValues.java | 2 +- 7 files changed, 26 insertions(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index deb7ac7335..c84d992f91 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -138,3 +138,4 @@ Jerzy Paciorkiewicz YozoZChomutova Qendolin Goobrr +[Error_27] diff --git a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java index 0fd4110ce7..151d35f01e 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java @@ -80,6 +80,7 @@ public class PayloadMassDriver extends PayloadBlock{ stats.add(Stat.payloadCapacity, StatValues.squared(maxPayloadSize, StatUnit.blocksSquared)); stats.add(Stat.reload, 60f / (chargeTime + reload), StatUnit.seconds); + stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks); } @Override diff --git a/core/src/mindustry/world/blocks/power/BeamNode.java b/core/src/mindustry/world/blocks/power/BeamNode.java index 7a4a4afcaa..206deec0c4 100644 --- a/core/src/mindustry/world/blocks/power/BeamNode.java +++ b/core/src/mindustry/world/blocks/power/BeamNode.java @@ -48,6 +48,13 @@ public class BeamNode extends PowerBlock{ addBar("batteries", PowerNode.makeBatteryBalance()); } + @Override + public void setStats(){ + super.setStats(); + + stats.add(Stat.powerRange, range, StatUnit.blocks); + } + @Override public void init(){ super.init(); diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java index 468641fe7c..97b0f8201c 100644 --- a/core/src/mindustry/world/blocks/production/BeamDrill.java +++ b/core/src/mindustry/world/blocks/production/BeamDrill.java @@ -5,9 +5,11 @@ import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; +import arc.struct.*; import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; +import mindustry.content.*; import mindustry.entities.units.*; import mindustry.game.*; import mindustry.gen.*; @@ -15,6 +17,7 @@ import mindustry.graphics.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; +import mindustry.world.blocks.environment.*; import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -102,6 +105,9 @@ public class BeamDrill extends Block{ public void 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){ stats.add(Stat.boostEffect, optionalBoostIntensity, StatUnit.timesSpeed); } diff --git a/core/src/mindustry/world/blocks/production/WallCrafter.java b/core/src/mindustry/world/blocks/production/WallCrafter.java index 15af0b629f..0f43bf7e8a 100644 --- a/core/src/mindustry/world/blocks/production/WallCrafter.java +++ b/core/src/mindustry/world/blocks/production/WallCrafter.java @@ -64,6 +64,7 @@ public class WallCrafter extends Block{ stats.add(Stat.output, output); stats.add(Stat.tiles, StatValues.blocks(attribute, floating, 1f, true, false)); + stats.add(Stat.drillSpeed, 60f / drillTime * size); } @Override diff --git a/core/src/mindustry/world/blocks/units/RepairTower.java b/core/src/mindustry/world/blocks/units/RepairTower.java index bf3a58b20b..60ed0c4152 100644 --- a/core/src/mindustry/world/blocks/units/RepairTower.java +++ b/core/src/mindustry/world/blocks/units/RepairTower.java @@ -11,6 +11,7 @@ import mindustry.gen.*; import mindustry.graphics.*; import mindustry.logic.*; import mindustry.world.*; +import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -29,6 +30,14 @@ public class RepairTower extends Block{ solid = true; } + @Override + public void setStats(){ + super.setStats(); + + stats.add(Stat.range, range, StatUnit.blocks); + stats.add(Stat.repairSpeed, healAmount * 60f, StatUnit.perSecond); + } + @Override public void drawPlace(int x, int y, int rotation, boolean valid){ super.drawPlace(x, y, rotation, valid); diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index b1962f232a..7e3551eb10 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -204,7 +204,7 @@ public class StatValues{ for(int i = 0; i < list.size; 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); l.add(item.localizedName).left().padLeft(1).padRight(4).colspan(item.uiIcon.found() ? 1 : 2); From 49c9841c8702213178f0c1286e3a141f598e792a Mon Sep 17 00:00:00 2001 From: ErrorInCode <43973418+Error-In-Code@users.noreply.github.com> Date: Wed, 8 Jun 2022 09:05:12 -0400 Subject: [PATCH 5/5] Add Reinforced Surge Wall Names (#6873) * Added Reinforced Surge Wall Names * i am not worthy --- core/assets/bundles/bundle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 323f718ad4..36cb74bf45 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1961,6 +1961,8 @@ block.tungsten-wall-large.name = Large Tungsten Wall block.blast-door.name = Blast Door block.carbide-wall.name = 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.build-tower.name = Build Tower block.regen-projector.name = Regen Projector