Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_be.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Забароненыя блокі
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Дадаць всё
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_bg.properties

@@ -636,7 +636,9 @@ resources.max = Max
 bannedblocks = Забранени блокове
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Добави Всички
 launch.from = Изстреляй от: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_ca.properties

@@ -640,7 +640,9 @@ resources.max = Màx.
 bannedblocks = Blocs no permesos
 objectives = Objectius
 bannedunits = Unitats no permeses
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Afegeix-ho tot
 launch.from = Llançant des de [accent]{0}.
 launch.capacity = Capacitat de càrrega per llançament: [accent]{0}

core/assets/bundles/bundle_cs.properties

@@ -638,7 +638,9 @@ resources.max = Max
 bannedblocks = Zakázané bloky
 objectives = Objectives
 bannedunits = Zakázané jednotky
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Přidat vše
 launch.from = Vysláno z: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_da.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Banlyste blokke
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Tilføj alle
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_de.properties

@@ -640,7 +640,9 @@ resources.max = Max
 bannedblocks = Gesperrte Blöcke
 objectives = Ziele
 bannedunits = Gesperrte Einheiten
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Alle hinzufügen
 launch.from = Items werden von [accent]{0} []gestartet
 launch.capacity = Ressourcenkapazität: [accent]{0}

core/assets/bundles/bundle_es.properties

@@ -644,7 +644,9 @@ resources.max = Max
 bannedblocks = Bloques prohibidos
 objectives = Objetivos
 bannedunits = Unidades prohibidas
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Añadir todo
 launch.from = Lanzando desde: [accent]{0}
 launch.capacity = Capacidad de objetos por envío: [accent]{0}

core/assets/bundles/bundle_et.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Banned Blocks
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_eu.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Debekatutako blokeak
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Gehitu denak
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_fi.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Kielletyt Palikat
 objectives = Tehtävät
 bannedunits = Kielletyt yksiköt
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Lisää kaikki
 launch.from = Laukaistaan kohteesta: [accent]{0}
 launch.capacity = Tavaratila laukaistaessa: [accent]{0}

core/assets/bundles/bundle_fil.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Mga Pinagbabawalan na Blocks
 objectives = Objectives
 bannedunits = Mga Pinagbabawalan na Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_fr.properties

@@ -644,7 +644,9 @@ resources.max = Max
 bannedblocks = Blocs bannis
 objectives = Objectifs
 bannedunits = Unités bannies
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Ajouter TOUT
 launch.from = Décollage depuis : [accent]{0}
 launch.capacity = Capacité de Lancement d'Objets : [accent]{0}

core/assets/bundles/bundle_hu.properties

@@ -635,7 +635,9 @@ resources.max = Max
 bannedblocks = Tiltott blokkok
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Összes hozzáadása
 launch.from = Indítás: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_id_ID.properties

@@ -644,7 +644,9 @@ resources.max = Maks
 bannedblocks = Balok yang Dilarang
 objectives = Tujuan
 bannedunits = Unit yang Dilarang
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Tambah Semua
 launch.from = Meluncurkan Dari: [accent]{0}
 launch.capacity = Kapasitas Barang yang Diluncurkan: [accent]{0}

core/assets/bundles/bundle_it.properties

@@ -634,7 +634,9 @@ resources.max = Max
 bannedblocks = Blocchi Banditi
 objectives = Obbiettivi
 bannedunits = Unità bandite
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Aggiungi Tutti
 launch.from = Partenza da: [accent]{0}
 launch.capacity = Capacità di lancio oggetti: [accent]{0}

core/assets/bundles/bundle_ja.properties

@@ -638,7 +638,9 @@ resources.max = Max
 bannedblocks = 禁止ブロック
 objectives = Objectives
 bannedunits = 禁止ユニット
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = すべて追加
 launch.from = [accent]{0}[] からの発射
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_ko.properties

@@ -639,7 +639,9 @@ resources.max = 최대
 bannedblocks = 금지된 블록
 objectives = 목표
 bannedunits = 금지된 기체
-whitelist = Whitelist
+rules.hidebannedblocks = 금지된 블록 숨기기
+bannedunits.whitelist = 금지된 기체만 활성화
+bannedblocks.whitelist = 금지된 블록만 활성화
 addall = 모두 추가
 launch.from = 출격 출발지: [accent]{0}[]
 launch.capacity = 출격 자원 용량: [accent]{0}
@@ -1166,9 +1168,9 @@ rules.placerangecheck = 배치 거리 확인
 rules.enemyCheat = 적 AI 무한자원
 rules.blockhealthmultiplier = 블록 체력 배수
 rules.blockdamagemultiplier = 블록 피해량 배수
-rules.hideBannedBlocks = Hide Banned Blocks
+rules.hideBannedBlocks = 금지된 블록 숨기기
 rules.unitbuildspeedmultiplier = 기체 생산속도 배수
-rules.unitcostmultiplier = Unit Cost Multiplier
+rules.unitcostmultiplier = 기체 비용 배수
 rules.unithealthmultiplier = 기체 체력 배수
 rules.unitdamagemultiplier = 기체 피해량 배수
 rules.solarmultiplier = 태양광 전력 배수

core/assets/bundles/bundle_lt.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Uždrausti blokai
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Pridėti visus
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_nl.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Verboden Blokken
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Voeg Alles Toe
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_nl_BE.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Banned Blocks
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_pl.properties

@@ -636,7 +636,9 @@ resources.max = Maks.
 bannedblocks = Zabronione bloki
 objectives = Cele
 bannedunits = Zabronione jednostki
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Dodaj wszystkie
 launch.from = Wystrzelony z: [accent]{0}
 launch.capacity = Wystrzelona Ilość Przedmiotów: [accent]{0}

core/assets/bundles/bundle_pt_BR.properties

@@ -644,7 +644,9 @@ resources.max = Máximo
 bannedblocks = Blocos Banidos
 objectives = Objetivos
 bannedunits = Unidades Banidas
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Adicionar Todos
 launch.from = Lançando de: [accent]{0}
 launch.capacity = Capacidade para Lançamento de Itens: [accent]{0}

core/assets/bundles/bundle_pt_PT.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Blocos banidos
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Adiciona tudo
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_ro.properties

@@ -638,7 +638,9 @@ resources.max = Max
 bannedblocks = Blocuri Interzise
 objectives = Objectives
 bannedunits = Unități Interzise
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Adaugă-le pe toate
 launch.from = Lansează Din: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_ru.properties

@@ -637,7 +637,9 @@ resources.max = Максимум
 bannedblocks = Запрещённые блоки
 objectives = Цели
 bannedunits = Запрещённые единицы
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Добавить всё
 launch.from = Запуск из: [accent]{0}
 launch.capacity = Вместимость запускаемого предмета: [accent]{0}

core/assets/bundles/bundle_sr.properties

@@ -638,7 +638,9 @@ resources.max = Maksimum
 bannedblocks = Nedozvoljeni Blokovi
 objectives = Zadaci
 bannedunits = Nedozvoljene Jedinice
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Dodaj Sve
 launch.from = Lansirati Od: [accent]{0}
 launch.capacity = Lansirni Kapacitet Materijala: [accent]{0}

core/assets/bundles/bundle_sv.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Banned Blocks
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_th.properties

@@ -638,7 +638,9 @@ resources.max = เต็ม
 bannedblocks = บล็อกต้องห้าม
 objectives = เป้าหมาย
 bannedunits = ยูนิตต้องห้าม
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = เพิ่มทั้งหมด
 launch.from = ลงจอดจากเซ็กเตอร์: [accent]{0}
 launch.capacity = ความจุไอเท็มลงจอด: [accent]{0}

core/assets/bundles/bundle_tk.properties

@@ -630,7 +630,9 @@ resources.max = Max
 bannedblocks = Banned Blocks
 objectives = Objectives
 bannedunits = Banned Units
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Add All
 launch.from = Launching From: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_tr.properties

@@ -638,7 +638,9 @@ resources.max = Maks
 bannedblocks = Yasaklı Bloklar
 objectives = Görevler
 bannedunits = Yasaklı Birimler
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Hepsini Ekle
 launch.from = [accent]{0} dan fırlatılıyor.
 launch.capacity = Fırlatılan Malzeme Kapasitesi: [accent]{0}

core/assets/bundles/bundle_uk_UA.properties

@@ -643,7 +643,9 @@ resources.max = Максимум
 bannedblocks = Заборонені блоки
 objectives = Завдання
 bannedunits = Заборонені одиниці
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Додати все
 launch.from = Запуск з [accent]{0}
 launch.capacity = Ємність предметів, що запускаються: [accent]{0}

core/assets/bundles/bundle_vi.properties

@@ -638,7 +638,9 @@ resources.max = Max
 bannedblocks = Khối bị cấm
 objectives = Objectives
 bannedunits = Quân lính bị cấm
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Thêm tất cả
 launch.from = Đang phóng từ: [accent]{0}
 launch.capacity = Launching Item Capacity: [accent]{0}

core/assets/bundles/bundle_zh_CN.properties

@@ -639,7 +639,9 @@ resources.max = 最大
 bannedblocks = 禁用建筑
 objectives = 任务目标
 bannedunits = 禁用单位
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = 全部装运
 launch.from = 发射自：[accent]{0}
 launch.capacity = 装运物品: [accent]{0}

core/assets/bundles/bundle_zh_TW.properties

@@ -644,7 +644,9 @@ resources.max = 最大
 bannedblocks = 禁用方塊
 objectives = 目標
 bannedunits = 禁用單位
-whitelist = Whitelist
+rules.hidebannedblocks = Hide Banned Blocks
+bannedunits.whitelist = Banned Units As Whitelist
+bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = 全部加入
 launch.from = 發射來源：[accent]{0}
 launch.capacity = 發射物品容量：[accent]{0}

core/src/mindustry/logic/GlobalVars.java

@@ -39,6 +39,13 @@ public class GlobalVars{
         put("true", 1);
         put("null", null);
         
+        //math
+        put("@pi", Mathf.PI);
+        put("π", Mathf.PI); //for the "cool" kids
+        put("@e", Mathf.E);
+        put("@degToRad", Mathf.degRad);
+        put("@radToDeg", Mathf.radDeg);
+        
         //time
         varTime = put("@time", 0);
         varTick = put("@tick", 0);
@@ -48,7 +55,6 @@ public class GlobalVars{
         varWaveTime = put("@waveTime", 0);
 
         //special enums
-
         put("@ctrlProcessor", ctrlProcessor);
         put("@ctrlPlayer", ctrlPlayer);
         put("@ctrlCommand", ctrlCommand);

core/src/mindustry/world/meta/StatValues.java

@@ -403,7 +403,7 @@ public class StatValues{
                     }
 
                     if(type.status != StatusEffects.none){
-                        sep(bt, (type.status.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName + "[lightgray] ~ [stat]" + ((int)(type.statusDuration / 60f)) + "[lightgray] " + Core.bundle.get("unit.seconds"));
+                        sep(bt, (type.status.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName + (type.status.reactive ? "" : "[lightgray] ~ [stat]" + ((int)(type.statusDuration / 60f)) + "[lightgray] " + Core.bundle.get("unit.seconds")));
                     }
 
                     if(type.fragBullet != null){