Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	core/src/mindustry/content/Blocks.java

	core/src/mindustry/net/CrashSender.java

	core/src/mindustry/ui/Links.java

	core/src/mindustry/ui/dialogs/SchematicsDialog.java

	core/src/mindustry/world/blocks/power/LightBlock.java

	gradle.properties

core/assets/bundles/bundle.properties

@@ -566,6 +566,7 @@ sectors.unexplored = [lightgray]Unexplored
 sectors.resources = Resources:
 sectors.production = Production:
 sectors.export = Export:
+sectors.import = Import:
 sectors.time = Time:
 sectors.threat = Threat:
 sectors.wave = Wave:
@@ -725,7 +726,7 @@ stat.maxconsecutive = Max Consecutive
 stat.buildcost = Build Cost
 stat.inaccuracy = Inaccuracy
 stat.shots = Shots
-stat.reload = Shots/Second
+stat.reload = Firing Rate
 stat.ammo = Ammo
 stat.shieldhealth = Shield Health
 stat.cooldowntime = Cooldown Time
@@ -794,7 +795,7 @@ bullet.damage = [stat]{0}[lightgray] damage
 bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary
 bullet.homing = [stat]homing
-bullet.frag = [stat]frag
+bullet.frags = [stat]{0}[lightgray]x frag bullets:
 bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
 bullet.buildingdamage = [stat]{0}%[lightgray] building damage
 bullet.knockback = [stat]{0}[lightgray] knockback
@@ -846,7 +847,6 @@ setting.doubletapmine.name = Double-Tap to Mine
 setting.modcrashdisable.name = Disable Mods On Startup Crash
 setting.animatedwater.name = Animated Surfaces
 setting.animatedshields.name = Animated Shields
-setting.antialias.name = Antialias[lightgray] (requires restart)[]
 setting.playerindicators.name = Player Indicators
 setting.indicators.name = Enemy Indicators
 setting.autotarget.name = Auto-Target
@@ -855,7 +855,8 @@ setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI Scaling[lightgray] (restart required)[]
+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
@@ -873,7 +874,8 @@ setting.saveinterval.name = Save Interval
 setting.seconds = {0} seconds
 setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullscreen
-setting.borderlesswindow.name = Borderless Window[lightgray] (restart may be required)
+setting.borderlesswindow.name = Borderless Window
+setting.borderlesswindow.description = Restart may be required to apply changes.
 setting.fps.name = Show FPS & Ping
 setting.smoothcamera.name = Smooth Camera
 setting.vsync.name = VSync
@@ -996,6 +998,7 @@ rules.wavetimer = Wave Timer
 rules.waves = Waves
 rules.attack = Attack Mode
 rules.buildai = AI Building
+rules.cleanupdeadteams = Clean Up Defeated Team Buildings (PvP)
 rules.corecapture = Capture Core On Destruction
 rules.polygoncoreprotection = Polygonal Core Protection
 rules.enemyCheat = Infinite AI (Red Team) Resources
@@ -1293,7 +1296,6 @@ block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Container
 block.launch-pad.name = Launch Pad
-block.launch-pad-large.name = Large Launch Pad
 block.segment.name = Segment
 block.command-center.name = Command Center
 block.ground-factory.name = Ground Factory
@@ -1314,11 +1316,11 @@ block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
+block.interplanetary-accelerator.name = Interplanetary Accelerator
 #experimental, may be removed
 block.block-forge.name = Block Forge
 block.block-loader.name = Block Loader
 block.block-unloader.name = Block Unloader
-block.interplanetary-accelerator.name = Interplanetary Accelerator
 
 block.switch.name = Switch
 block.micro-processor.name = Micro Processor
@@ -1548,6 +1550,8 @@ block.memory-bank.description = Stores information for a logic processor. High c
 block.logic-display.description = Displays arbitrary graphics from a logic processor.
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
+block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
+block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 
 unit.dagger.description = Fires standard bullets at all nearby enemies.
 unit.mace.description = Fires streams of flame at all nearby enemies.
@@ -1582,6 +1586,11 @@ unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Co
 unit.alpha.description = Defends the Shard core from enemies. Builds structures.
 unit.beta.description = Defends the Foundation core from enemies. Builds structures.
 unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
+unit.retusa.description = Places proximity mines. Repairs allied units.
+unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
+unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
+unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
+unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
 
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.

core/assets/bundles/bundle_ko.properties

@@ -100,7 +100,8 @@ joingame = 게임 참여
 customgame = 사용자 지정 게임
 newgame = 새 게임
 none = < 없음 >
-none.found = [lightgray]< 없거나 찾을 수 없음 >
+none.found = [lightgray]< 찾을 수 없음 >
+none.inmap = [lightgray]< 맵에 없음 >
 minimap = 미니맵
 position = 위치
 close = 닫기

core/assets/bundles/bundle_ru.properties

@@ -845,7 +845,6 @@ setting.doubletapmine.name = Добыча руды двойным нажатие
 setting.modcrashdisable.name = Отключение модификаций после вылета при запуске
 setting.animatedwater.name = Анимированные поверхности
 setting.animatedshields.name = Анимированные щиты
-setting.antialias.name = Сглаживание[lightgray] (требует перезапуска)[]
 setting.playerindicators.name = Индикаторы направления игроков
 setting.indicators.name = Индикаторы направления врагов
 setting.autotarget.name = Автозахват цели
@@ -854,7 +853,7 @@ setting.touchscreen.name = Сенсорное управление
 setting.fpscap.name = Максимальный FPS
 setting.fpscap.none = Неограниченный
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Масштаб пользовательского интерфейса[lightgray] (необходим перезапуск)[]
+setting.uiscale.name = Масштаб пользовательского интерфейса
 setting.swapdiagonal.name = Всегда диагональное размещение
 setting.difficulty.training = Обучение
 setting.difficulty.easy = Лёгкая
@@ -872,7 +871,7 @@ setting.saveinterval.name = Интервал сохранения
 setting.seconds = {0} секунд
 setting.milliseconds = {0} миллисекунд
 setting.fullscreen.name = Полноэкранный режим
-setting.borderlesswindow.name = Безрамочное окно[lightgray] (может потребоваться перезапуск)
+setting.borderlesswindow.name = Безрамочное окно
 setting.fps.name = Показывать FPS и пинг
 setting.smoothcamera.name = Плавная камера
 setting.vsync.name = Вертикальная синхронизация