Merge remote-tracking branch 'origin/master'

2026-10-03 03:31:28 +03:00 · 2026-08-28 16:54:29 -04:00
parent e6b66673a3 756439ce66
commit 98cec2df46
42 changed files with 139 additions and 11 deletions
@@ -1611,6 +1611,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Калі ўключана, разгрузчыкі з
 rules.derelictrepair = Дазволіць рамантаваць пакінутыя блокі
 rules.reactorexplosions = Выбухі рэактараў
 rules.coreincinerates = Ядро Спальвае Рэсурсы
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Адключыць сусветныя працэсары
 rules.schematic = Схемы Дазволены
 rules.wavetimer = Інтэрвал хваляў
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Когато е включено, разтоварв
 rules.derelictrepair = Разрешете поправянето на изоставени блокове
 rules.reactorexplosions = Експлозивни реактори
 rules.coreincinerates = Унищожаване на ресурси при преливане
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Изключване на процесорите за света
 rules.schematic = Позволена употребата на схеми
 rules.wavetimer = Таймер за Вълни
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Si s’activa, els descarregadors de Serpulo podran t
 rules.derelictrepair = Permet la reparació dels blocs en ruïnes
 rules.reactorexplosions = Explosions als reactors
 rules.coreincinerates = El nucli incinera els excedents
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Desactiva els processadors integrats
 rules.schematic = Permetre l’ús d’esquemes
 rules.wavetimer = Temporitzador d’onades
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Pokud je zapnuto, vykladače na Serpulu mohou brát p
 rules.derelictrepair = Povolit opravu opuštěných bloků
 rules.reactorexplosions = Výbuch reaktoru
 rules.coreincinerates = Jádro Spaluje Nadbytečné Suroviny
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Zakázat Světové Procesory
 rules.schematic = Šablony povoleny
 rules.wavetimer = Časovač vln
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reaktor-eksplosioner
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Skabeloner tilladt
 rules.wavetimer = Bølge-æggeur
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reaktor-Explosionen
 rules.coreincinerates = Kern verbrennt überflüssige Materialien
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Deaktiviere Weltprozessoren
 rules.schematic = Entwürfe erlaubt
 rules.wavetimer = Wellen-Timer
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Cuando está activado, Los descargadores de Serpulo p
 rules.derelictrepair = Permitir reparar bloques abandonados
 rules.reactorexplosions = Explosiones de reactores
 rules.coreincinerates = Incinerar exceso de recursos en el núcleo
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Desactivar procesadores estáticos
 rules.schematic = Permitir esquemas
 rules.wavetimer = Temporizador de oleadas
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Kasuta taimerit
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Baimendu bloke abandonatuen konponketa
 rules.reactorexplosions = Erreaktorearen eztandak
 rules.coreincinerates = Nukleoen erraustegien gainezkatzea
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Munduko prozesadoreak desgaitu
 rules.schematic = Onartutako eskemak
 rules.wavetimer = Boladen denboragailua
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reaktorien räjähtäminen
 rules.coreincinerates = Ydin höyrystää ylivuodon
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Poista maailmaprosessorit käytöstä
 rules.schematic = Salli kaaviot
 rules.wavetimer = Tasojen aikaraja
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Lorsque cette option est activée, les déchargeurs d
 rules.derelictrepair = Autoriser la réparation des structures abandonnées
 rules.reactorexplosions = Explosion des Réacteurs
 rules.coreincinerates = Incinération des surplus du Noyau
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Désactiver les Processeurs Globaux
 rules.schematic = Schémas autorisés
 rules.wavetimer = Compte à rebours des vagues
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Ha engedélyezve van, akkor a Serpulo kirakodói nyer
 rules.derelictrepair = Elhagyatott épületek javításának engedélyezése
 rules.reactorexplosions = Reaktorrobbanások
 rules.coreincinerates = Többletnyersanyagok megsemmisítése a támaszpontban
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Világprocesszorok letiltása
 rules.schematic = Vázlatok engedélyezése
 rules.wavetimer = Hullámok időzítése
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Saat diaktifkan, pembongkar Serpulo dapat membongkar
 rules.derelictrepair = Izinkan Perbaikan Blok Derelik
 rules.reactorexplosions = Ledakan Reaktor
 rules.coreincinerates = Penghangusan Luapan Inti
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Nonaktifkan Prosesor Dunia
 rules.schematic = Skematik Diperbolehkan
 rules.wavetimer = Pengaturan Waktu Gelombang
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Esplosioni Reattore
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disabilita processori
 rules.schematic = Schematiche Consentite
 rules.wavetimer = Timer Ondate
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = 有効にすると、セルプロの搬出機がコ
 rules.derelictrepair = 廃墟修復可能
 rules.reactorexplosions = リアクターの爆発
 rules.coreincinerates = 余剰アイテムの焼却
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = ワールドプロセッサーを無効にする
 rules.schematic = 設計図を許可
 rules.wavetimer = ウェーブの自動進行
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = 이 기능을 활성화하면, 세르풀로 언로더
 rules.derelictrepair = 잔해 블록 수리 허용
 rules.reactorexplosions = 원자로 폭발 허용
 rules.coreincinerates = 코어에 특정 자원량 초과 시 자동 소각 허용
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = 월드 프로세서 비활성화
 rules.schematic = 설계도 허용
 rules.wavetimer = 시간 제한이 있는 단계
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reaktorių Sprogimai
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Bangų Laikmatis
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Ontploffende Reactors
 rules.coreincinerates = Core verbrandt overvloed aan materialen.
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Zet Wereld-Processors Uit.
 rules.schematic = Ontwerpen Toegestaan
 rules.wavetimer = Vijandelijke Golven Timer
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Gdy włączone, rozładowywacze Serpulo mogą pobiera
 rules.derelictrepair = Zezwól na naprawę opuszczonego bloku
 rules.reactorexplosions = Eksplozje Reaktorów
 rules.coreincinerates = Rdzeń Spala Nadmiarowe Przedmioty
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Wyłącz Procesor Świata
 rules.schematic = Zezwalaj na schematy
 rules.wavetimer = Zegar Fal
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Quando ativado, descarregadores de Serpulo podem tira
 rules.derelictrepair = Permitir Reparo de Blocos Abandonados
 rules.reactorexplosions = Reatores explodem
 rules.coreincinerates = Núcleo incinera itens em excesso
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Desativar processadores mundiais
 rules.schematic = Permitir Esquemas
 rules.wavetimer = Tempo de horda
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Permitir Reparação de Blocos Derelict
 rules.reactorexplosions = Esploções de Reatores
 rules.coreincinerates = Núcleo destrói Itens em Excesso
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Desativar Processadores Globais
 rules.schematic = Esquemas Permitidos
 rules.wavetimer = Tempo de Horda
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactoarele Explodează
 rules.coreincinerates = Nucleul Incinerează Resursele în Plus
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Se Pot Folosi Scheme
 rules.wavetimer = Valuri pe Timp
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = При включении, разгрузчики н
 rules.derelictrepair = Разрешить починку покинутых построек
 rules.reactorexplosions = Взрывы реакторов
 rules.coreincinerates = Ядро сжигает избыток ресурсов
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Отключить мировые процессоры
 rules.schematic = Разрешить схемы
 rules.wavetimer = Интервал волн
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Eksplozije Reaktora
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Onesposobi Svetovne Procesore
 rules.schematic = Šeme Su Dozvoljene
 rules.wavetimer = Talasna Štoperica
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Vågtimer
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = เมื่อเปิดใช้งาน ตั
 rules.derelictrepair = อนุญาตการซ่อมแซมบล็อกทิ้งร้าง
 rules.reactorexplosions = เปิดการระเบิดของเตาปฏิกร
 rules.coreincinerates = แกนกลางเผาทรัพยากรส่วนเกิน
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = ปิดการทำงานของตัวประมวลผลโลก
 rules.schematic = อนุญาตให้ใช้แผนผัง
 rules.wavetimer = นับถอยหลังการปล่อยคลื่น
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = When enabled, Serpulo unloaders can take items from t
 rules.derelictrepair = Allow Derelict Block Repair
 rules.reactorexplosions = Reactor Explosions
 rules.coreincinerates = Core Incinerates Overflow
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Aktifken, Serpulo Boşaltıcıları Merkezden malzeme
 rules.derelictrepair = Kalıntıları Tamir Etmeye İzin Ver
 rules.reactorexplosions = Reaktör Patlamaları
 rules.coreincinerates = Merkez Taşanları Eritir
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Evrensel İşlemcileri Devredışı Bırak
 rules.schematic = Şema Kullanılabilir
 rules.wavetimer = Dalga Zamanlayıcısı
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Якщо увімкнено, розвантажува
 rules.derelictrepair = Дозволити відновлення будівель Переможених
 rules.reactorexplosions = Вибухи реактора
 rules.coreincinerates = Ядро спалює надлишкові предмети
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Вимкнути світові процесори
 rules.schematic = Використання схем дозволено
 rules.wavetimer = Таймер для хвиль
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = Khi bật, điểm dỡ hàng của Serpulo có thể
 rules.derelictrepair = Cho Phép Sửa Khối Bỏ Hoang
 rules.reactorexplosions = Nổ Nò Phản Ứng
 rules.coreincinerates = Hủy Vật Phẩm Khi Lõi Đầy
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = Vô Hiệu Hoá Bộ Xử Lý Thế Giới
 rules.schematic = Cho Phép Dùng Bản Thiết Kế
 rules.wavetimer = Đếm Ngược Đợt
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = 当启用时，塞普罗的装卸器可以从核心
 rules.derelictrepair = 允许修复残骸建筑
 rules.reactorexplosions = 允许反应堆爆炸
 rules.coreincinerates = 核心焚烧溢出资源
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = 禁用世界处理器
 rules.schematic = 允许使用蓝图
 rules.wavetimer = 波次计时器
@@ -1606,6 +1606,8 @@ rules.coreunloaders.info = 開啟後，裝卸器可從核心提取物資。\n不
 rules.derelictrepair = 允許修復殘骸建築
 rules.reactorexplosions = 反應爐爆炸
 rules.coreincinerates = 核心銷毀物品
+rules.corebuildandconfig = Deconstruct And Configure Cores
+rules.corebuildandconfig.info = Allows building and deconstructing cores anywhere, not just on core zones.\nAlso shows ui on cores to change player team.
 rules.disableworldprocessors = 停用世界處理器
 rules.schematic = 允許使用藍圖
 rules.wavetimer = 波次時間
@@ -95,7 +95,7 @@ public class ShieldArcAbility extends Ability{
                paramField.data -= unit.health() * paramField.missileUnitMultiplier * Vars.state.rules.unitDamage(unit.team);
                paramField.alpha = 1f;

-            }else if(paramField.pushUnits && !(!unit.isFlying() && paramUnit.isFlying())){
+            }else if(paramField.pushUnits && (paramField.pushDiffLayer || paramUnit.isFlying() == unit.isFlying())){

                float reach = paramField.radius + paramField.width;
                float overlapDst = reach - unit.dst(paramPos);
@@ -158,6 +158,8 @@ public class ShieldArcAbility extends Ability{
    public boolean offsetRegion = false;
    /** If true, enemy units are pushed out. */
    public boolean pushUnits = true;
+    /** If pushUnits is true, allow ground units to push air or air units to push ground */
+    public boolean pushDiffLayer = true;
    public Effect pushEffect = Fx.circleColorSpark;

    /** State. */
@@ -96,7 +96,7 @@ public class LiquidBulletType extends BulletType{
        Puddles.deposit(world.tileWorld(hitx, hity), liquid, puddleSize);

        if(liquid.temperature <= 0.5f && liquid.flammability < 0.3f){
-            float intensity = 400f * puddleSize/6f;
+            float intensity = 400f * (liquid.heatCapacity / 0.4f) * (puddleSize / 6f);
            Fires.extinguish(world.tileWorld(hitx, hity), intensity);
            for(Point2 p : Geometry.d4){
                Fires.extinguish(world.tileWorld(hitx + p.x * tilesize, hity + p.y * tilesize), intensity);
@@ -25,6 +25,8 @@ public class Rules{
    public boolean allowEditRules = false;
    /** Sandbox mode: Enables infinite resources, build range and build speed. */
    public boolean infiniteResources;
+    /** Allow building and deconstructing cores anywhere, as well as showing ui to change teams */
+    public boolean coreBuildAndConfig = false;
    /** Team-specific rules. */
    public TeamRules teams = new TeamRules();
    /** Whether the waves come automatically on a timer. If not, waves come when the play button is pressed. */
@@ -164,6 +164,7 @@ public class CustomRulesDialog extends BaseDialog{
        category("resourcesbuilding");
        check("@rules.alloweditworldprocessors", b -> rules.allowEditWorldProcessors = b, () -> rules.allowEditWorldProcessors);
        check("@rules.infiniteresources", b -> rules.infiniteResources = b, () -> rules.infiniteResources);
+        check("@rules.corebuildandconfig", b -> rules.coreBuildAndConfig = b, () -> rules.coreBuildAndConfig);
        check("@rules.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore);
        check("@rules.coreunloaders", b -> rules.allowCoreUnloaders = b, () -> rules.allowCoreUnloaders);
        check("@rules.derelictrepair", b -> rules.derelictRepair = b, () -> rules.derelictRepair);
@@ -93,7 +93,8 @@ public class ModBrowserDialog extends BaseDialog{
            String strResult = response.getResultAsString();

            try{
-                Seq<ModListing> mods = json.fromJson(Seq.class, ModListing.class, strResult);
+                Seq<ModListing> parsed = json.fromJson(Seq.class, ModListing.class, strResult);
+                Seq<ModListing> mods = parsed == null ? new Seq<>() : parsed;

                var d = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
                Func<String, Date> parser = text -> {
@@ -171,7 +171,8 @@ public class CoreBlock extends StorageBlock{

    @Override
    public boolean canBreak(Tile tile){
-        return state.isEditor();
+        //always keep at least 1 core to not lose the save
+        return state.isEditor() || (state.rules.coreBuildAndConfig && tile.block() instanceof CoreBlock && state.teams.cores(tile.team()).size > 1);
    }

    @Override
@@ -183,8 +184,8 @@ public class CoreBlock extends StorageBlock{
    @Override
    public boolean canPlaceOn(Tile tile, Team team, int rotation){
        if(tile == null) return false;
-        //in the editor, you can place them anywhere for convenience
-        if(state.isEditor()) return true;
+        //in the editor or with gamerule, you can place them anywhere for convenience
+        if(state.isEditor() || state.rules.coreBuildAndConfig) return true;

        CoreBuild core = team.core();

@@ -283,6 +284,57 @@ public class CoreBlock extends StorageBlock{
            return block.unloadable && state.rules.allowCoreUnloaders;
        }

+        @Override
+        public void buildConfiguration(Table table){
+            if(!state.rules.coreBuildAndConfig) return;
+
+            ButtonGroup<ImageButton> group = new ButtonGroup<>();
+            group.setMinCheckCount(0);
+            Table cont = new Table();
+            cont.defaults().size(32f);
+
+            int i = 0;
+            for(Team team : Team.baseTeams){
+                ImageButton button = cont.button(Tex.whiteui, Styles.clearTogglei, 24f, () -> {
+                }).group(group).get();
+                button.changed(() -> {
+                    if(button.isChecked()){
+                        configure(team.id);
+                    }
+                });
+                button.getStyle().imageUpColor = team.color;
+                button.update(() -> button.setChecked(this.team == team));
+
+                if(i++ % 3 == 2){
+                    cont.row();
+                }
+            }
+
+            ScrollPane pane = new ScrollPane(cont, Styles.smallPane);
+            pane.setScrollingDisabled(true, false);
+            pane.setOverscroll(false, false);
+            table.add(pane).maxHeight(Scl.scl(40f * 2f)).left();
+            table.row();
+        }
+
+        @Override
+        public void configured(@Nullable Unit builder, @Nullable Object value){
+            super.configured(builder, value);
+            if(!state.rules.coreBuildAndConfig || !(value instanceof Integer)) return;
+
+            Team next = Team.get((int)value);
+            if(builder != null && builder.isPlayer()){
+                builder.team(next);
+                builder.getPlayer().team(next);
+            }
+            changeTeam(next);
+        }
+
+        @Override
+        public boolean shouldHideConfigure(Player player){
+            return !state.rules.coreBuildAndConfig;
+        }
+
        @Override
        public void draw(){
            //draw thrusters when just landed
@@ -532,6 +584,7 @@ public class CoreBlock extends StorageBlock{
        @Override
        public void created(){
            super.created();
+            block.configurable = state.rules.coreBuildAndConfig;

            Events.fire(new CoreChangeEvent(this));
        }
@@ -591,6 +644,7 @@ public class CoreBlock extends StorageBlock{

        @Override
        public void updateTile(){
+            block.configurable = state.rules.coreBuildAndConfig;
            iframes -= Time.delta;
            thrusterTime -= Time.delta/90f;
        }
@@ -855,12 +855,10 @@ public class StatValues{

    /** Adds an info table with an icon and description key from the bundle */
    private static Cell<?> tableInfo(Table table, String key){
+        if(!Core.bundle.has(key)) return null;
        return table.table(t -> {
-            if(Core.bundle.has(key) && !Vars.headless){
-                t.image(Icon.info.getRegion()).size(20).color(Color.lightGray).scaling(Scaling.fit).padRight(8).padLeft(12);
-                t.add("[lightgray]" + Core.bundle.get(key));
-                t.row().add().height(10f).row();
-            }
+            if(!Vars.headless) t.image(Icon.info.getRegion()).size(20).color(Color.lightGray).scaling(Scaling.fit).padRight(8).padLeft(12);
+            t.add("[lightgray]" + Core.bundle.get(key)).padBottom(10f);
        });
    }