Merge remote-tracking branch 'origin/master'

2022-06-25 09:45:17 -04:00
parent 0ee53817d8 5b25919e38
commit 4ae157d50f
35 changed files with 38 additions and 0 deletions
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2027,6 +2027,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -2011,6 +2011,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -2019,6 +2019,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1980,6 +1980,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -2018,6 +2018,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -2026,6 +2026,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricador
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -2029,6 +2029,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1993,6 +1993,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -2026,6 +2026,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabrikator
 block.tank-refabricator.name = Refabrikator Tank
 block.mech-refabricator.name = Refabrikator Mech
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -1991,6 +1991,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1999,6 +1999,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -2019,6 +2019,7 @@ block.sublimate.name = 서브리메이트
 block.titan.name = 티탄
 block.disperse.name = 디스퍼스
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = 조립기
 block.tank-refabricator.name = 전차 재구성기
 block.mech-refabricator.name = 기계 재구성기
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -2014,6 +2014,7 @@ block.sublimate.name = Sublimator
 block.titan.name = Tytan
 block.disperse.name = Rozpraszacz
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabrykator
 block.tank-refabricator.name = Konstruktor Czołgów
 block.mech-refabricator.name = Konstruktor Mechów
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1991,6 +1991,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -2019,6 +2019,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -2018,6 +2018,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -2019,6 +2019,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -2019,6 +2019,7 @@ block.sublimate.name = สะบลีเมท
 block.titan.name = ไททัน
 block.disperse.name = ดิสเพอร์ส
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = เครื่องสร้าง
 block.tank-refabricator.name = เครื่องพัฒนารถถัง
 block.mech-refabricator.name = เครื่องพัฒนายานอวกาศ
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -1982,6 +1982,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -2020,6 +2020,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabrikatör
 block.tank-refabricator.name = Tank Yeniden Yapılandırıcı
 block.mech-refabricator.name = Robot Yeniden Yapılandırıcı
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -2026,6 +2026,7 @@ block.sublimate.name = Сублімація
 block.titan.name = Титан
 block.disperse.name = Розпорошувач
 block.afflict.name = Уражач
 block.lustre.name = Lustre
 block.fabricator.name = Виробник
 block.tank-refabricator.name = Танковий рефабрикатор
 block.mech-refabricator.name = Меховий рефакбрикатор
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -2019,6 +2019,7 @@ block.sublimate.name = Sublimate
 block.titan.name = Titan
 block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -2019,6 +2019,7 @@ block.sublimate.name = 升华
 block.titan.name = 泰坦
 block.disperse.name = 驱离
 block.afflict.name = 折磨
 block.lustre.name = Lustre
 block.fabricator.name = 单位制造厂
 block.tank-refabricator.name = 坦克重构厂
 block.mech-refabricator.name = 机甲重构厂
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -2026,6 +2026,7 @@ block.sublimate.name = 昇華
 block.titan.name = 巨人
 block.disperse.name = 驅離者
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.fabricator.name = 製造廠
 block.tank-refabricator.name = 戰車重塑者
 block.mech-refabricator.name = 機甲重塑者
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -142,5 +142,9 @@
  {
    "name": "Fish",
    "address": ["170.187.144.235"]
  },
 {
    "name": "AAS",
    "address": ["fi01.optik.host:28453"]
  }
 ]