Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -86,7 +86,7 @@ committingchanges = Comitting Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
 
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -103,7 +103,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}
@@ -599,7 +599,7 @@ setting.shadows.name = Shadows
 setting.blockreplace.name = Automatic Block Suggestions
 setting.linear.name = Linear Filtering
 setting.hints.name = Hints
-setting.buildautopause.name = Auto-pause Building
+setting.buildautopause.name = Auto-Pause Building
 setting.animatedwater.name = Animated Water
 setting.animatedshields.name = Animated Shields
 setting.antialias.name = Antialias[lightgray] (requires restart)[]
@@ -624,7 +624,7 @@ setting.destroyedblocks.name = Display Destroyed Blocks
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Save Interval
-setting.seconds = {0} Seconds
+setting.seconds = {0} seconds
 setting.fullscreen.name = Fullscreen
 setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
 setting.fps.name = Show FPS & Ping
@@ -660,8 +660,8 @@ keybind.clear_building.name = Clear Building
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
 keybind.screenshot.name = Map Screenshot
-keybind.move_x.name = Move x
+keybind.move_x.name = Move X
-keybind.move_y.name = Move y
+keybind.move_y.name = Move Y
 keybind.mouse_move.name = Follow Mouse
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
@@ -682,16 +682,16 @@ keybind.pause_building.name = Pause/Resume Building
 keybind.minimap.name = Minimap
 keybind.dash.name = Dash
 keybind.chat.name = Chat
-keybind.player_list.name = Player list
+keybind.player_list.name = Player List
 keybind.console.name = Console
 keybind.rotate.name = Rotate
 keybind.rotateplaced.name = Rotate Existing (Hold)
-keybind.toggle_menus.name = Toggle menus
+keybind.toggle_menus.name = Toggle Menus
-keybind.chat_history_prev.name = Chat history prev
+keybind.chat_history_prev.name = Chat History Prev
-keybind.chat_history_next.name = Chat history next
+keybind.chat_history_next.name = Chat History Next
-keybind.chat_scroll.name = Chat scroll
+keybind.chat_scroll.name = Chat Scroll
 keybind.drop_unit.name = Drop Unit
-keybind.zoom_minimap.name = Zoom minimap
+keybind.zoom_minimap.name = Zoom Minimap
 mode.help.title = Description of modes
 mode.survival.name = Survival
 mode.survival.description = The normal mode. Limited resources and automatic incoming waves.\n[gray]Requires enemy spawns in the map to play.
@@ -720,7 +720,7 @@ rules.respawntime = Respawn Time:[lightgray] (sec)
 rules.wavespacing = Wave Spacing:[lightgray] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
-rules.waitForWaveToEnd = Waves wait for enemies
+rules.waitForWaveToEnd = Waves Wait for Enemies
 rules.dropzoneradius = Drop Zone Radius:[lightgray] (tiles)
 rules.respawns = Max respawns per wave
 rules.limitedRespawns = Limit Respawns
@@ -1008,7 +1008,7 @@ unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
 tutorial.next = [lightgray]<Tap to continue>
-tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse [[WASD] to move.\n[accent]Hold [[Ctrl] while scrolling[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
+tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse [accent][[WASD][] to move.\n[accent]Hold [[Ctrl] while scrolling[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.drill = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nClick the drill tab in the bottom right.\nSelect the[accent] mechanical drill[]. Place it on a copper vein by clicking.\n[accent]Right-click[] to stop building.
 tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills[] can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.

core/assets/bundles/bundle_cs.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Nahrávám prohlížecí soubor
 committingchanges = Provádím změny
 done = Hotovo
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_de.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_es.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Hecho
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_et.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Eelvaate faili üleslaadimine
 committingchanges = Muudatuste teostamine
 done = Valmis
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_eu.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Aurrebista fitxategia igotzen
 committingchanges = Aldaketak aplikatzen
 done = Egina
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_fr.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Publication du fichier d'aperçu
 committingchanges = Validation des modifications
 done = Fait
 feature.unsupported = Votre appareil ne supporte pas cette fonctionnalité.
-mods.alphainfo = Gardez à l'esprit que les mods sont en alpha et[scarlet] peuvent être très buggés[].\nMerci de signaler les problèmes que vous rencontrez via le Github ou le Discord Mindustry.
+mods.alphainfo = Gardez à l'esprit que les mods sont en alpha et[scarlet] peuvent être très buggés[].\nMerci de signaler les problèmes que vous rencontrez via le GitHub ou le Discord Mindustry.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]Aucun mod trouvé!
@@ -98,7 +98,7 @@ mod.enable = Activer
 mod.requiresrestart = Le jeu va maintenant s'arrêter pour appliquer les modifications du mod.
 mod.reloadrequired = [scarlet]Rechargement requis
 mod.import = Importer un mod
-mod.import.github = Importer un mod Github
+mod.import.github = Importer un mod GitHub
 mod.remove.confirm = Ce mod sera supprimé.
 mod.author = [LIGHT_GRAY]Auteur:[] {0}
 mod.missing = Cette sauvegarde contient des mods que vous avez récemment mis à jour ou que vous avez désinstallés. Votre sauvegarde risque d'être corrompue. Êtes-vous sûr de vouloir l'importer?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_fr_BE.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_in_ID.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Mengupload File Tinjauan
 committingchanges = Membuat Perubahan
 done = Selesai
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_it.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Carico file di anteprima
 committingchanges = Applico le modifiche
 done = Fatto
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Tieni a mente che queste mod sono in alpha, e[scarlet] possono avere molti bug[].\nRiporta tutti i problemi che trovi in Mindustry su Github o Discord.
+mods.alphainfo = Tieni a mente che queste mod sono in alpha, e[scarlet] possono avere molti bug[].\nRiporta tutti i problemi che trovi in Mindustry su GitHub o Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]Nessuna mod trovata!
@@ -98,7 +98,7 @@ mod.enable = Abilita
 mod.requiresrestart = .
 mod.reloadrequired = [scarlet]Riavvio necessario
 mod.import = Importa una mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = Questa mod verrà cancellata.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = Questo salvataggio contiene mod che hai recentemente aggiornato o non le hai piu installate. Il salvataggio può essere corrotto. sei sicuro di volerlo caricare?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_ja.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = プレビューファイルをアップロードしてい
 committingchanges = 変更を適応中
 done = 完了
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Mods機能は実験的なものです。[scarlet] エラーが含まれている可能性があります[]。\n 発見した問題をMindustry Githubに報告してください。
+mods.alphainfo = Mods機能は実験的なものです。[scarlet] エラーが含まれている可能性があります[]。\n 発見した問題をMindustry GitHubに報告してください。
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]Modが見つかりませんでした!
@@ -98,7 +98,7 @@ mod.enable = 有効化
 mod.requiresrestart = このModをインストールするためにはゲームの再起動が必要です。
 mod.reloadrequired = [scarlet]Modを有効にするには、この画面を開き直してください。
 mod.import = Modをインポート
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = このModを削除します。
 mod.author = [LIGHT_GRAY]著者:[] {0}
 mod.missing = このセーブには、アップグレードされた可能性があるModsか、ここに存在しないModsが必要です。 メモリのセーブを保存する! ロードしてもよろしいですか?\n[lightgray]MODS:\n{0}

core/assets/bundles/bundle_nl.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_nl_BE.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_pl.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Przesyłanie Pliku Podglądu
 committingchanges = Zatwierdzanie Zmian
 done = Gotowe
 feature.unsupported = Twoje urządzenie nie wspiera tej funkcji.
-mods.alphainfo = Pamiętaj, że mody są wersji alpha, i[scarlet] mogą być pełne błędów[].\nZgłaszaj wszystkie znalezione problemy na Mindustry Github lub Discord.
+mods.alphainfo = Pamiętaj, że mody są wersji alpha, i[scarlet] mogą być pełne błędów[].\nZgłaszaj wszystkie znalezione problemy na Mindustry GitHub lub Discord.
 mods.alpha = [scarlet](Alpha)
 mods = Mody
 mods.none = [LIGHT_GRAY]Nie znaleziono modów!
@@ -98,7 +98,7 @@ mod.enable = Włącz
 mod.requiresrestart = Gra się wyłączy aby wprowadzić zmiany moda.
 mod.reloadrequired = [scarlet]Wymagany restart
 mod.import = Importuj Mod
-mod.import.github = Importuj mod z Githuba
+mod.import.github = Importuj mod z GitHuba
 mod.remove.confirm = Ten mod zostanie usunięty.
 mod.author = [LIGHT_GRAY]Autor:[] {0}
 mod.missing = Ten zapis zawiera mody, które zostały niedawno zaktualizowane, bądź nie są już zainstalowane. Zapis może zostać uszkodzony. Czy jesteś pewien, że chcesz go załadować?\n[lightgray]Mody:\n{0}

core/assets/bundles/bundle_pt.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Enviando ficheiro de pré-visualização
 committingchanges = Enviando mudanças
 done = Feito
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Ativar
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Importar Mod
-mod.import.github = Importar Mod da Github
+mod.import.github = Importar Mod da GitHub
 mod.remove.confirm = Este mod irá ser apagado.
 mod.author = [LIGHT_GRAY]Autor:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_pt_BR.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Fazendo upload do arquivo de pré-visualização
 committingchanges = Enviando mudanças
 done = Feito
 feature.unsupported = Seu dispositivo não suporta essa função.
-mods.alphainfo = Mantenha em mente que os mods estão em Alpha, e[scarlet] talvez sejam bem bugados[].\nReporte quaisquer problemas no Discord ou Github do Mindustry.
+mods.alphainfo = Mantenha em mente que os mods estão em Alpha, e[scarlet] talvez sejam bem bugados[].\nReporte quaisquer problemas no Discord ou GitHub do Mindustry.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]Nenhum Mod encontrado!
@@ -98,7 +98,7 @@ mod.enable = Ativar
 mod.requiresrestart = O jogo irá fechar para aplicar as mudanças do Mod.
 mod.reloadrequired = [scarlet]Recarregamento necessário
 mod.import = Importar Mod
-mod.import.github = Importar Mod do Github
+mod.import.github = Importar Mod do GitHub
 mod.remove.confirm = Esse Mod será deletado.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = Esse jogo salvo foi criado antes de você atualizar ou desinstalar um mod. O jogo salvo pode se corromper. Você tem certeza que quer carregar?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_ru.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Выгрузка файла предпросмотра
 committingchanges = Внесение изменений
 done = Готово
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Имейте в виду, что модификации находятся в альфа-версии и могут содержать много ошибок[]. Докладывайте о любых проблемах, которые Вы найдете в Mindustry Github или Discord.
+mods.alphainfo = Имейте в виду, что модификации находятся в альфа-версии и могут содержать много ошибок[]. Докладывайте о любых проблемах, которые Вы найдете в Mindustry GitHub или Discord.
 mods.alpha = [accent](Альфа)
 mods = Модификации
 mods.none = [LIGHT_GRAY]Модификации не найдены!
@@ -98,7 +98,7 @@ mod.enable = Включить
 mod.requiresrestart = Теперь игра закроется, чтобы применить изменения в модификациях.
 mod.reloadrequired = [scarlet]Необходим перезапуск
 mod.import = Импортировать модификацию
-mod.import.github = Импортировать модификацию с Github
+mod.import.github = Импортировать модификацию с GitHub
 mod.remove.confirm = Этот мод будет удалён.
 mod.author = [LIGHT_GRAY]Автор:[] {0}
 mod.missing = Это сохранение содержит модификацию, которое Вы недавно обновили или оно больше не установлено. Может случиться повреждение сохранения. Вы уверены, что хотите загрузить его?\n[lightgray]Модификации:\n{0}

core/assets/bundles/bundle_sv.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Laddar upp förhandsgranskningsfil
 committingchanges = Comitting Changes
 done = Klar
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_tk.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord.
 mods.alpha = [accent](Alpha)
 mods = Mods
 mods.none = [LIGHT_GRAY]No mods found!
@@ -98,7 +98,7 @@ mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
 mod.reloadrequired = [scarlet]Reload Required
 mod.import = Import Mod
-mod.import.github = Import Github Mod
+mod.import.github = Import GitHub Mod
 mod.remove.confirm = This mod will be deleted.
 mod.author = [LIGHT_GRAY]Author:[] {0}
 mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0}

core/assets/bundles/bundle_tr.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Önizleme Dosyası Yükleniyor
 committingchanges = Değişiklikler Uygulanıyor
 done = Bitti
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = Modların alfa aşamasında olduğunu ve [scarlet]oldukça hatalı olabileceklerini[] unutmayın.\nBulduğunuz sorunları Mindustry Github'ı veya Discord'una bildirin.
+mods.alphainfo = Modların alfa aşamasında olduğunu ve [scarlet]oldukça hatalı olabileceklerini[] unutmayın.\nBulduğunuz sorunları Mindustry GitHub'ı veya Discord'una bildirin.
 mods.alpha = [accent](Alpha)
 mods = Modlar
 mods.none = [LIGHT_GRAY]Hiç mod bulunamadı!
@@ -98,7 +98,7 @@ mod.enable = Etkinleştir
 mod.requiresrestart = Oyun mod değişikliklerini uygulamak için kapatılacak.
 mod.reloadrequired = [scarlet]Yeniden Yükleme Gerekli
 mod.import = Mod İçeri Aktar
-mod.import.github = Github Modu İçeri Aktar 
+mod.import.github = GitHub Modu İçeri Aktar 
 mod.remove.confirm = Bu mod silinecek.
 mod.author = [LIGHT_GRAY]Yayıncı:[] {0}
 mod.missing = Bu kayıt yakın zamanda güncellediğiniz ya da artık yüklü olmayan modlar içermekte. Kayıt bozulmaları yaşanabilir. Kaydı yüklemek istediğinizden emin misiniz?\n[lightgray]Modlar:\n{0}

core/assets/bundles/bundle_uk_UA.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = Вивантаження файлу передперег
 committingchanges = Здійснення змін
 done = Зроблено
 feature.unsupported = Ваш пристрій не підтримує цю особливість.
-mods.alphainfo = Майте на увазі, що модифікації знаходяться в альфі, і [scarlet]можуть бути дуже глючними[].\nПовідомте про будь-які проблеми, які ви знайдете до Mindustry Github або Discord.
+mods.alphainfo = Майте на увазі, що модифікації знаходяться в альфі, і [scarlet]можуть бути дуже глючними[].\nПовідомте про будь-які проблеми, які ви знайдете до Mindustry GitHub або Discord.
 mods.alpha = [scarlet](Альфа)
 mods = Модифікації
 mods.none = [LIGHT_GRAY]Модифікацій не знайдено!

core/assets/bundles/bundle_zh_CN.properties

@@ -81,7 +81,7 @@ uploadingpreviewfile = 正在上传预览文件
 committingchanges = 提交更改
 done = 已完成
 feature.unsupported = Your device does not support this feature.
-mods.alphainfo = 请注意在测试版本中的模组[scarlet]可能有缺陷[]。\n在 Mindustry Github 或 Discord上报告你发现的问题。
+mods.alphainfo = 请注意在测试版本中的模组[scarlet]可能有缺陷[]。\n在 Mindustry GitHub 或 Discord上报告你发现的问题。
 mods.alpha = [accent](测试版)
 mods = 模组
 mods.none = [LIGHT_GRAY]无模组！
@@ -98,7 +98,7 @@ mod.enable = 启用
 mod.requiresrestart = 需要重启使模组生效。
 mod.reloadrequired = [scarlet]需要重启
 mod.import = 导入模组
-mod.import.github = 导入 Github 模组
+mod.import.github = 导入 GitHub 模组
 mod.remove.confirm = 此模组将被删除。
 mod.author = [LIGHT_GRAY]作者：[] {0}
 mod.missing = 此存档包含更新后的模组或不再使用的模组。存档可能会损坏。确定要加载它吗？\n[lightgray]模组：\n{0}

core/assets/bundles/bundle_zh_TW.properties

@@ -85,7 +85,7 @@ uploadingpreviewfile = 上傳預覽文件
 committingchanges = 提交變更
 done = 完成
 feature.unsupported = 您的設備不支持此功能。
-mods.alphainfo = 請記住，模組仍處於Alpha狀態，[scarlet]可能會有很多BUG[].\n向Mindustry Github或Discord報告發現的任何問題。
+mods.alphainfo = 請記住，模組仍處於Alpha狀態，[scarlet]可能會有很多BUG[].\n向Mindustry GitHub或Discord報告發現的任何問題。
 mods.alpha = [accent](Alpha)
 mods = 模組
 mods.none = [lightgray]找不到模組!
@@ -102,7 +102,7 @@ mod.nowdisabled = [scarlet]「{0}'」模組缺少依賴項目:[accent] {1}\n[lig
 mod.requiresrestart = 遊戲將立即關閉以套用模組變更。
 mod.reloadrequired = [scarlet]需要重新載入
 mod.import = 匯入模組
-mod.import.github = 匯入Github模組
+mod.import.github = 匯入GitHub模組
 mod.remove.confirm = 該模組將被刪除。
 mod.author = [lightgray]作者:[] {0}
 mod.missing = 此存檔含有您最近更新或不再安裝的模組。可能會發生存檔損毀。您確定要載入嗎？\n[lightgray]模組:\n{0}

core/src/io/anuke/mindustry/content/Blocks.java

@@ -48,7 +48,7 @@ public class Blocks implements ContentList{
     melter, separator, sporePress, pulverizer, incinerator, coalCentrifuge,
 
     //sandbox
-    powerVoid, powerSource, itemSource, liquidSource, itemVoid, message,
+    powerSource, powerVoid, itemSource, itemVoid, liquidSource, message,
 
     //defense
     scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet
@@ -537,7 +537,7 @@ public class Blocks implements ContentList{
             hasPower = true;
 
             consumes.power(4f);
-            consumes.items(new ItemStack(Items.titanium, 2), new ItemStack(Items.lead, 4), new ItemStack(Items.silicon, 3), new ItemStack(Items.copper, 3));
+            consumes.items(new ItemStack(Items.copper, 3), new ItemStack(Items.lead, 4), new ItemStack(Items.titanium, 2), new ItemStack(Items.silicon, 3));
         }};
 
         cryofluidMixer = new LiquidConverter("cryofluidmixer"){{
@@ -713,11 +713,11 @@ public class Blocks implements ContentList{
         //endregion
         //region sandbox
 
-        powerVoid = new PowerVoid("power-void"){{
+        powerSource = new PowerSource("power-source"){{
             requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with());
             alwaysUnlocked = true;
         }};
-        powerSource = new PowerSource("power-source"){{
+        powerVoid = new PowerVoid("power-void"){{
             requirements(Category.power, BuildVisibility.sandboxOnly, ItemStack.with());
             alwaysUnlocked = true;
         }};

core/src/io/anuke/mindustry/content/Zones.java

@@ -189,7 +189,6 @@ public class Zones implements ContentList{
             startingItems = list(copper, 250, lead, 100);
             conditionWave = 15;
             launchPeriod = 10;
-            requirements = with(new ZoneWave(ruinousShores, 20));
             resources = with(copper, scrap, lead, coal, titanium, thorium, sand);
             requirements = with(
             new ZoneWave(ruinousShores, 20),

core/src/io/anuke/mindustry/input/Binding.java

@@ -10,6 +10,7 @@ public enum Binding implements KeyBind{
     move_x(new Axis(KeyCode.A, KeyCode.D), "general"),
     move_y(new Axis(KeyCode.S, KeyCode.W)),
     mouse_move(KeyCode.MOUSE_BACK),
+    dash(KeyCode.SHIFT_LEFT),
     select(KeyCode.MOUSE_LEFT),
     deselect(KeyCode.MOUSE_RIGHT),
     break_block(KeyCode.MOUSE_RIGHT),
@@ -23,7 +24,6 @@ public enum Binding implements KeyBind{
     schematic_flip_x(KeyCode.Z),
     schematic_flip_y(KeyCode.X),
     schematic_menu(KeyCode.T),
-    dash(KeyCode.SHIFT_LEFT),
     zoom_hold(KeyCode.CONTROL_LEFT, "view"),
     zoom(new Axis(KeyCode.SCROLL)),
     menu(Core.app.getType() == ApplicationType.Android ? KeyCode.BACK : KeyCode.ESCAPE),

core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java

@@ -218,7 +218,7 @@ public class SettingsMenuDialog extends SettingsDialog{
                 control.setInput(new MobileInput());
             }
         }*/
-        game.sliderPref("saveinterval", 60, 10, 5 * 120, i -> Core.bundle.format("setting.seconds", i));
+        game.sliderPref("saveinterval", 60, 10, 5 * 120, 10, i -> Core.bundle.format("setting.seconds", i));
 
         if(!mobile){
             game.checkPref("crashreport", true);