Merge branch 'master' into patch-1

.github/workflows/pr.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Run unit tests and build JAR
       run: ./gradlew desktop:dist
     - name: Upload desktop JAR for testing
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Desktop JAR (zipped)
         path: desktop/build/libs/Mindustry.jar

android/src/mindustry/android/AndroidLauncher.java

@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState){
         UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
 
         Thread.setDefaultUncaughtExceptionHandler((thread, error) -> {
-            CrashSender.log(error);
+            CrashHandler.log(error);
 
             //try to forward exception to system handler
             if(handler != null){

core/assets/bundles/bundle.properties

@@ -197,6 +197,7 @@ campaign.select = Select Starting Campaign
 campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
 campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nMore difficult. Higher quality maps and overall experience.
 campaign.serpulo = Older content; the classic experience. More open-ended, more content.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Researched
 techtree = Tech Tree
 techtree.select = Tech Tree Selection
@@ -358,6 +359,7 @@ command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
 stance.stop = Cancel Orders
 stance.shoot = Stance: Shoot
 stance.holdfire = Stance: Hold Fire
@@ -718,9 +720,9 @@ objective.enemyescelating = [accent]Enemy production escalating in [lightgray]{0
 objective.enemyairunits = [accent]Enemy air unit production beginning in [lightgray]{0}[]
 objective.destroycore = [accent]Destroy Enemy Core
 objective.command = [accent]Command Units
-objective.nuclearlaunch = [accent]\u26A0 Nuclear launch detected: [lightgray]{0}
+objective.nuclearlaunch = [accent]\u26A0 Missile launch detected: [lightgray]{0}
 
-announce.nuclearstrike = [red]\u26A0 NUCLEAR STRIKE INBOUND \u26A0\n[lightgray]construct backup cores immediately
+announce.nuclearstrike = [red]\u26A0 MISSILE STRIKE INBOUND \u26A0\n[lightgray]construct backup cores immediately
 
 loadout = Loadout
 resources = Resources
@@ -800,6 +802,12 @@ threat.high = High
 threat.extreme = Extreme
 threat.eradication = Eradication
 
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
+
 planets = Planets
 
 planet.serpulo.name = Serpulo
@@ -827,6 +835,8 @@ sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Planetary Launch Terminal
 sector.coastline.name = Coastline
 sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
 
 sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
 sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.
@@ -849,7 +859,9 @@ sector.navalFortress.description = The enemy has established a base on a remote,
 #do not translate
 sector.facility32m.description = WIP, map submission by Stormride_R
 sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
 sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
 
 sector.onset.name = The Onset
 sector.aegis.name = Aegis
@@ -1172,12 +1184,6 @@ setting.fpscap.text = {0} FPS
 setting.uiscale.name = UI Scaling
 setting.uiscale.description = Restart required to apply changes.
 setting.swapdiagonal.name = Always Diagonal Placement
-setting.difficulty.training = Training
-setting.difficulty.easy = Easy
-setting.difficulty.normal = Normal
-setting.difficulty.hard = Hard
-setting.difficulty.insane = Insane
-setting.difficulty.name = Difficulty:
 setting.screenshake.name = Screen Shake
 setting.bloomintensity.name = Bloom Intensity
 setting.bloomblur.name = Bloom Blur
@@ -1269,6 +1275,7 @@ keybind.unit_command_load_units.name = Unit Command: Load Units
 keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
 keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
 keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
 
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
@@ -1350,11 +1357,13 @@ rules.allowedit.info = When enabled, the player can edit rules in-game via the b
 rules.alloweditworldprocessors = Allow Editing World Processors
 rules.alloweditworldprocessors.info = When enabled, world logic blocks can be placed and edited even outside the editor.
 rules.waves = Waves
-rules.airUseSpawns = Air units use spawn points
+rules.airUseSpawns = Air Units Use Spawn Points
 rules.attack = Attack Mode
 rules.buildai = Base Builder AI
 rules.buildaitier = Builder AI Tier
 rules.rtsai = RTS AI [red](WIP)
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
 rules.rtsminsquadsize = Min Squad Size
 rules.rtsmaxsquadsize = Max Squad Size
 rules.rtsminattackweight = Min Attack Weight
@@ -1397,6 +1406,9 @@ rules.title.teams = Teams
 rules.title.planet = Planet
 rules.lighting = Lighting
 rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Fire
 rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
@@ -1406,6 +1418,7 @@ rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
 
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
 rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
 rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
@@ -2009,7 +2022,7 @@ split.container = Similar to the container, units can also be transported using
 item.copper.description = Used in all types of construction and ammunition.
 item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
 item.lead.description = Used in liquid transportation and electrical structures.
-item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms; not that there are many left here.
 item.metaglass.description = Used in liquid distribution/storage structures.
 item.graphite.description = Used in electrical components and turret ammunition.
 item.sand.description = Used for production of other refined materials.

core/assets/bundles/bundle_be.properties

@@ -189,6 +189,7 @@ campaign.select = Выбраць Пачатковую Кампанію
 campaign.none = [lightgray]Выберыце з якой планеты пачаць.\nГэта можна змяніць ў любы час.
 campaign.erekir = Навей, больш удасканаленага кантэнту. Больш лінейнае праходжанне кампаніі.\n\nБольш якасныя карты і агульны вопыт.
 campaign.serpulo = Старэйшы кантэнт; класічны вопыт. Больш адкрытая.\n\nЗусім не збалансаваныя карты і механікі кампаніі. Менш удасканаленага.
+campaign.difficulty = Difficulty
 completed = [accent]Завершаны
 techtree = Дрэва\n Тэхналогій
 techtree.select = Выбар Дрэва Тэхналогій
@@ -347,6 +348,7 @@ command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
 stance.stop = Cancel Orders
 stance.shoot = Stance: Shoot
 stance.holdfire = Stance: Hold Fire
@@ -774,6 +776,11 @@ threat.medium = Сярэдняя
 threat.high = Высокая
 threat.extreme = Экстрымальная
 threat.eradication = Вынішчэнне
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 planets = Планеты
 
 planet.serpulo.name = Серпуло
@@ -801,6 +808,8 @@ sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Планетарны Пускавы Тэрмінал
 sector.coastline.name = Берагавая Лінія
 sector.navalFortress.name = Марская Крэпасць
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
 
 sector.groundZero.description = Аптымальнае месца каб пачаць. Нізкая варожая пагроза. Мала рэсурсаў.\nВазімце як мага болей свінца і медзі.\nІ рухайцеся далей.
 sector.frozenForest.description = Нават тут, бліжэй да гор, распаўсюдзіліся споры. Ледзяныя тэмпературы не могуць утрымліваць іх заўсёды.\n\nПачніце выкарыстоўваць энергію. Пабудуйце генератары на цвёрдым паліве. Даведайцеся як выкарыстоуваць рэгенератары.
@@ -822,7 +831,9 @@ sector.coastline.description = Remnants of naval unit technology have been detec
 sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
 sector.facility32m.description = WIP, map submission by Stormride_R
 sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
 sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
 sector.onset.name = Пачатак
 sector.aegis.name = Ахова
 sector.lake.name = Рака
@@ -1142,12 +1153,6 @@ setting.fpscap.text = {0} FPS
 setting.uiscale.name = Маштаб карыстальніцкага інтэрфейсу [lightgray] (перазапусьціцца)[]
 setting.uiscale.description = Каб змены ўжыліся патрабуецца перазапуск.
 setting.swapdiagonal.name = Заўсёды дыяганальнае размяшчэнне
-setting.difficulty.training = Навучанне
-setting.difficulty.easy = Лёгкая
-setting.difficulty.normal = Нармальны
-setting.difficulty.hard = Складаная
-setting.difficulty.insane = Вар’яцкая
-setting.difficulty.name = Складанасць:
 setting.screenshake.name = Трасяніна экрана
 setting.bloomintensity.name = Інтэнсіўнасць Цвету
 setting.bloomblur.name = Размыты Цвет
@@ -1237,6 +1242,7 @@ keybind.unit_command_load_units.name = Unit Command: Load Units
 keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
 keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
 keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
 keybind.rebuild_select.name = Перабудаваць Рэгіён
 keybind.schematic_select.name = Абраць Вобласць
 keybind.schematic_menu.name = Меню Схем
@@ -1322,6 +1328,8 @@ rules.attack = Рэжым атакі
 rules.buildai = Base Builder AI
 rules.buildaitier = Builder AI Tier
 rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
 rules.rtsminsquadsize = Мінімальны Размер Атраду
 rules.rtsmaxsquadsize = Максімальны Размер Атраду
 rules.rtsminattackweight = Мінімальная Вага Атакі
@@ -1364,6 +1372,9 @@ rules.title.teams = Кманды
 rules.title.planet = Планета
 rules.lighting = Асвятленне
 rules.fog = Туман Вайны
+rules.invasions = Enemy Sector Invasions
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Агонь
 rules.anyenv = <Любы>
 rules.explosions = Падрыўныя пашкоджанні Блока/Адзінкі
@@ -1372,6 +1383,7 @@ rules.weather = Надвор'е
 rules.weather.frequency = Частата:
 rules.weather.always = Заўсёды
 rules.weather.duration = Працягласць:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
 rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
 rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 

core/assets/bundles/bundle_bg.properties

@@ -193,6 +193,7 @@ campaign.select = Select Starting Campaign
 campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
 campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience.
 campaign.serpulo = Older content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
+campaign.difficulty = Difficulty
 completed = [accent]Завършено
 techtree = Tech Tree
 techtree.select = Tech Tree Selection
@@ -352,6 +353,7 @@ command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload
+command.loopPayload = Loop Unit Transfer
 stance.stop = Cancel Orders
 stance.shoot = Stance: Shoot
 stance.holdfire = Stance: Hold Fire
@@ -782,6 +784,11 @@ threat.medium = Средна
 threat.high = Висока
 threat.extreme = Екстремна
 threat.eradication = Унищожителна
+difficulty.casual = Casual
+difficulty.easy = Easy
+difficulty.normal = Normal
+difficulty.hard = Hard
+difficulty.eradication = Eradication
 
 planets = Планети
 
@@ -810,6 +817,8 @@ sector.infestedCanyons.name = Infested Canyons
 sector.planetaryTerminal.name = Терминал за космически мисии
 sector.coastline.name = Coastline
 sector.navalFortress.name = Naval Fortress
+sector.polarAerodrome.name = Polar Aerodrome
+sector.atolls.name = Atolls
 
 sector.groundZero.description = Перфектното място за започване отначало. Ниска заплаха. Ниски ресурси.\nСъбери колкото можеш мед и олово.\nПродължи напред.
 sector.frozenForest.description = Дори тук, близо до планините, спорите са се разпространили. Мразовитите температури не могат да ги задържат вечно.\n\nОвладейте електричеството. Постройте горивни генератори. Научете се да ползвате възстрановители.
@@ -831,7 +840,9 @@ sector.coastline.description = Remnants of naval unit technology have been detec
 sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
 sector.facility32m.description = WIP, map submission by Stormride_R
 sector.taintedWoods.description = WIP, map submission by Stormride_R
+sector.atolls.description = WIP, map submission by Stormride_R
 sector.infestedCanyons.description = WIP, map submission by Skeledragon
+sector.polarAerodrome.description = WIP, map submission by hhh i 17
 sector.onset.name = The Onset
 sector.aegis.name = Aegis
 sector.lake.name = Lake
@@ -1153,12 +1164,6 @@ setting.fpscap.text = {0} FPS
 setting.uiscale.name = Размер на Интерфейсът[lightgray] (изисква рестарт)[]
 setting.uiscale.description = Restart required to apply changes.
 setting.swapdiagonal.name = Винаги Диагонално Поставяне
-setting.difficulty.training = Тренировка
-setting.difficulty.easy = Лесно
-setting.difficulty.normal = Нормално
-setting.difficulty.hard = Трудно
-setting.difficulty.insane = Безумно
-setting.difficulty.name = Трудност:
 setting.screenshake.name = Клатене на Екрата
 setting.bloomintensity.name = Bloom Intensity
 setting.bloomblur.name = Bloom Blur
@@ -1248,6 +1253,7 @@ keybind.unit_command_load_units.name = Unit Command: Load Units
 keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
 keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
 keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+keybind.unit_command_loop_payload.name = Unit Command: Loop Unit Transfer
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Избери Регион
 keybind.schematic_menu.name = Меню със Схеми
@@ -1333,6 +1339,8 @@ rules.attack = Режим Атака
 rules.buildai = Base Builder AI
 rules.buildaitier = Builder AI Tier
 rules.rtsai = RTS AI
+rules.rtsai.campaign = RTS Attack AI
+rules.rtsai.campaign.info = In attack maps, makes units group up and attack player bases in a more intelligent manner.
 rules.rtsminsquadsize = Min Squad Size
 rules.rtsmaxsquadsize = Max Squad Size
 rules.rtsminattackweight = Min Attack Weight
@@ -1375,6 +1383,9 @@ rules.title.teams = Teams
 rules.title.planet = Planet
 rules.lighting = Светкавици
 rules.fog = Fog of War
+rules.invasions = Enemy Sector Invasions
+rules.showspawns = Show Enemy Spawns
+rules.randomwaveai = Unpredictable Wave AI
 rules.fire = Огън
 rules.anyenv = <Any>
 rules.explosions = Block/Unit Explosion Damage
@@ -1383,6 +1394,7 @@ rules.weather = Климат
 rules.weather.frequency = Честота:
 rules.weather.always = Винаги
 rules.weather.duration = Продължителност:
+rules.randomwaveai.info = Makes units spawned in waves target random structures instead of directly attacking the core or power generators.
 rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
 rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.