Fixed server map find bug

core/assets/bundles/bundle_cs.properties

@@ -406,6 +406,7 @@ category.crafting = Vyžaduje
 category.shooting = Střílí
 category.optional = Volitelné vylepšení
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Indikátor pro spojence
 setting.autotarget.name = Automaticky zaměřuje
 setting.fpscap.name = Max FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Citlivost ovladače
 setting.saveinterval.name = Interval automatického ukládání
 setting.seconds = {0} Sekund
 setting.fullscreen.name = Celá obrazovka
+setting.borderless.name = Borderless Window
 setting.fps.name = Ukázat snímky/sekundu
 setting.vsync.name = Vertikální synchronizace
 setting.lasers.name = Ukázat laser energie
@@ -593,10 +595,12 @@ block.water.name = Voda
 block.tar.name = Tar
 block.stone.name = Kámen
 block.sand.name = Písek
+block.darksand.name = Dark Sand
 block.ice.name = Led
 block.snow.name = Sníh
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Velká thoriová stěna
 block.door.name = Dveře
 block.door-large.name = Velké dveře
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer

core/assets/bundles/bundle_de.properties

@@ -406,6 +406,7 @@ category.crafting = Erzeugung
 category.shooting = Schießen
 category.optional = Optional Enhancements
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Zielauswahl
 setting.fpscap.name = Max FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Controller-Empfindlichkeit
 setting.saveinterval.name = Autosave Häufigkeit
 setting.seconds = {0} Sekunden
 setting.fullscreen.name = Vollbild
+setting.borderless.name = Borderless Window
 setting.fps.name = Zeige FPS
 setting.vsync.name = VSync
 setting.lasers.name = Zeige Stromlaser
@@ -593,10 +595,12 @@ block.water.name = Wasser
 block.tar.name = Teer
 block.stone.name = Stein
 block.sand.name = Sand
+block.darksand.name = Dark Sand
 block.ice.name = Eis
 block.snow.name = Schnee
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Große Thorium-Mauer
 block.door.name = Tür
 block.door-large.name = Große Tür
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer

core/assets/bundles/bundle_es.properties

@@ -406,6 +406,7 @@ category.crafting = Fabricación
 category.shooting = Disparo
 category.optional = Mejoras Opcionales
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto apuntado
 setting.fpscap.name = Máx FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Sensibilidad del Control
 setting.saveinterval.name = Intervalo del Auto-guardado
 setting.seconds = {0} Segundos
 setting.fullscreen.name = Pantalla Completa
+setting.borderless.name = Borderless Window
 setting.fps.name = Mostrar FPS
 setting.vsync.name = VSync
 setting.lasers.name = Mostrar Energía de los Láseres
@@ -593,10 +595,12 @@ block.water.name = Agua
 block.tar.name = Alquitrán
 block.stone.name = Piedra
 block.sand.name = Arena
+block.darksand.name = Dark Sand
 block.ice.name = Hielo
 block.snow.name = Nieve
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Pared de Torio grande
 block.door.name = Puerta
 block.door-large.name = Puerta Larga
 block.duo.name = Dúo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Granizo
 block.lancer.name = Lancero

core/assets/bundles/bundle_fr.properties

@@ -406,6 +406,7 @@ category.crafting = Fabrication
 category.shooting = Défense
 category.optional = Optional Enhancements
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Visée automatique
 setting.fpscap.name = Max FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Sensibilité de la manette
 setting.saveinterval.name = Intervalle des sauvegardes auto
 setting.seconds = {0} secondes
 setting.fullscreen.name = Plein écran
+setting.borderless.name = Borderless Window
 setting.fps.name = Afficher FPS
 setting.vsync.name = VSync
 setting.lasers.name = Afficher les rayons des lasers
@@ -593,10 +595,12 @@ block.water.name = Eau
 block.tar.name = Pétrole
 block.stone.name = Roche
 block.sand.name = Sable
+block.darksand.name = Dark Sand
 block.ice.name = glace
 block.snow.name = Neige
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Mur en Thorium large
 block.door.name = Porte
 block.door-large.name = Grande porte
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancier

core/assets/bundles/bundle_fr_BE.properties

@@ -406,6 +406,7 @@ category.crafting = Fabrication
 category.shooting = Défense
 category.optional = Améliorations facultatives
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Indicateurs d'alliés
 setting.autotarget.name = Visée automatique
 setting.fpscap.name = Max FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Contôle de la sensibilité
 setting.saveinterval.name = Intervalle des sauvegardes auto
 setting.seconds = {0} Secondes
 setting.fullscreen.name = Plein écran
+setting.borderless.name = Borderless Window
 setting.fps.name = Afficher FPS
 setting.vsync.name = VSync
 setting.lasers.name = Afficher les rayons des lasers
@@ -593,10 +595,12 @@ block.water.name = Eau
 block.tar.name = Pétrole
 block.stone.name = Roche
 block.sand.name = Sable
+block.darksand.name = Dark Sand
 block.ice.name = Glace
 block.snow.name = Neige
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Mur en Thorium large
 block.door.name = Porte
 block.door-large.name = Grande porte
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer

core/assets/bundles/bundle_in_ID.properties

@@ -406,6 +406,7 @@ category.crafting = Crafting
 category.shooting = Shooting
 category.optional = Optional Enhancements
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Sensitivitas Pengendali
 setting.saveinterval.name = Waktu Simpan Otomatis
 setting.seconds = {0} Detik
 setting.fullscreen.name = Layar Penuh
+setting.borderless.name = Borderless Window
 setting.fps.name = Tunjukkan FPS
 setting.vsync.name = VSync
 setting.lasers.name = Tampilkan Laser Tenaga
@@ -593,10 +595,12 @@ block.water.name = water
 block.tar.name = Tar
 block.stone.name = stone
 block.sand.name = sand
+block.darksand.name = Dark Sand
 block.ice.name = ice
 block.snow.name = snow
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Large Thorium Wall
 block.door.name = pintu
 block.door-large.name = pintu besar
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer

core/assets/bundles/bundle_it.properties

@@ -406,6 +406,7 @@ category.crafting = Produzione
 category.shooting = Potenza di fuoco
 category.optional = Optional Enhancements
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Limite FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Sensibilità del controller
 setting.saveinterval.name = Intervallo di salvataggio automatico
 setting.seconds = {0} Secondi
 setting.fullscreen.name = Schermo Intero
+setting.borderless.name = Borderless Window
 setting.fps.name = Mostra FPS
 setting.vsync.name = VSync
 setting.lasers.name = Mostra Laser Energetici
@@ -593,10 +595,12 @@ block.water.name = acqua
 block.tar.name = Tar
 block.stone.name = pietra
 block.sand.name = sabbia
+block.darksand.name = Dark Sand
 block.ice.name = ghiaccio
 block.snow.name = neve
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Muro grande di torio
 block.door.name = porta
 block.door-large.name = Porta grande
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Bombardiere
 block.lancer.name = Idrogetto

core/assets/bundles/bundle_ja.properties

@@ -14,7 +14,6 @@ screenshot = スクリーンショットを {0} に保存しました。
 gameover = ゲームオーバー
 gameover.pvp = [accent] {0}[] チームの勝利!
 highscore = [accent]ハイスコアを記録!
-
 stat.wave = 防衛したウェーブ:[accent] {0}
 stat.enemiesDestroyed = 敵による破壊数:[accent] {0}
 stat.built = 建設した建造物数:[accent] {0}
@@ -22,10 +21,8 @@ stat.destroyed = 破壊した建造物数:[accent] {0}
 stat.deconstructed = 解体した建造物数:[accent] {0}
 stat.delivered = 獲得した資源:
 stat.rank = ランク: [accent]{0}
-
 placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
 removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
-
 map.delete = マップ "[accent]{0}[]" を削除してもよろしいですか?
 level.highscore = ハイスコア: [accent]{0}
 level.select = レベル選択
@@ -196,7 +193,7 @@ editor.waves = ウェーブ:
 waves.title = ウェーブ
 waves.remove = 削除
 waves.never = <永久>
-waves.every = 
+waves.every = every
 waves.waves = ウェーブごとに出現
 waves.perspawn = スポーン
 waves.to = から
@@ -409,6 +406,7 @@ category.crafting = 製作速度
 category.shooting = 攻撃速度
 category.optional = 機能強化オプション
 setting.animatedwater.name = 水のアニメーション
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = 味方の方角表示
 setting.autotarget.name = 自動ターゲット
 setting.fpscap.name = 最大FPS
@@ -427,6 +425,7 @@ setting.sensitivity.name = 操作感度
 setting.saveinterval.name = 自動保存間隔
 setting.seconds = {0} 秒
 setting.fullscreen.name = フルスクリーン
+setting.borderless.name = Borderless Window
 setting.fps.name = FPSを表示
 setting.vsync.name = VSync
 setting.lasers.name = 電力レーザーを表示
@@ -570,8 +569,8 @@ block.salt.name = 岩塩氷河
 block.sandrocks.name = 砂岩
 block.spore-pine.name = 胞子の松の木
 block.sporerocks.name = 胞子の岩
-block.snowrock.name = Snow Rock
 block.rock.name = 岩
+block.snowrock.name = Snow Rock
 block.shale.name = 泥板岩
 block.shale-boulder.name = 泥板岩の丸石
 block.moss.name = コケ
@@ -596,10 +595,12 @@ block.water.name = 水
 block.tar.name = タール
 block.stone.name = 石
 block.sand.name = 砂
+block.darksand.name = Dark Sand
 block.ice.name = 氷
 block.snow.name = 雪
 block.craters.name = クレーター
 block.sand-water.name = 濁った水
+block.darksand-water.name = Dark Sand Water
 block.char.name = 焦げ跡
 block.holostone.name = ホロストーン
 block.ice-snow.name = 雪氷
@@ -631,6 +632,7 @@ block.thorium-wall-large.name = 大きなトリウムの壁
 block.door.name = ドア
 block.door-large.name = 大きなドア
 block.duo.name = デュオ
+block.scorch.name = Scorch
 block.scatter.name = スキャッター
 block.hail.name = ヘイル
 block.lancer.name = ランサー
@@ -856,7 +858,6 @@ block.wraith-factory.description = 高速で突撃攻撃が可能な迎撃ユニ
 block.ghoul-factory.description = 大型の爆撃機のグールを製造します。
 block.dagger-factory.description = 基本的な地上ユニットのダガーを製造します。
 block.titan-factory.description = 改良された武装地上ユニットのタイタンを製造します。
-
 block.fortress-factory.description = 大型の砲撃地上ユニットのフォートレスを製造します。
 block.revenant-factory.description = 大型のレーザー航空ユニットのレベナントを製造します。
 block.repair-point.description = 近くの負傷したユニットを修復します。

core/assets/bundles/bundle_ko.properties

@@ -198,6 +198,12 @@ waves.waves = 웨이브마다
 waves.perspawn = 스폰.
 waves.to = 부터
 waves.boss = 이 몹은 보스임.
+waves.preview = Preview
+waves.edit = Edit...
+waves.copy = Copy to Clipboard
+waves.load = Load from Clipboard
+waves.invalid = Invalid waves in clipboard.
+waves.copied = Waves copied.
 editor.default = [LIGHT_GRAY]<기본값>
 edit = 편집...
 editor.name = 이름:
@@ -207,6 +213,7 @@ editor.errorload = [accent]{0} 파일을 불러오는데 실패했습니다.
 editor.errorsave = [accent]{0} 파일을 저장하는데 실패했습니다.
 editor.errorname = 맵에 이름이 지정되어 있지 않습니다.
 editor.update = 업데이트
+editor.randomize = Randomize
 editor.apply = 적용
 editor.generate = 생성
 editor.resize = 맵 크기조정
@@ -250,12 +257,12 @@ filter.option.threshold = 문지방
 filter.option.circle-scale = 둥근 크기
 filter.option.octaves = 옥타보스
 filter.option.falloff = 절벽
+filter.option.block = Block
 filter.option.floor = 바닥
 filter.option.wall = 벽
 filter.option.ore = 자원
 filter.option.floor2 = 2번째 바닥
 filter.option.threshold2 = 2번째 문지방
-filter.option.block = Block
 width = 넓이:
 height = 높이:
 menu = 메뉴
@@ -399,6 +406,7 @@ category.crafting = 제작
 category.shooting = 사격
 category.optional = 보조 아이템
 setting.animatedwater.name = 움직이는 물
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = 아군/적 인디게이터 표시
 setting.autotarget.name = 자동 조준
 setting.fpscap.name = 최대 FPS
@@ -417,6 +425,7 @@ setting.sensitivity.name = 컨트롤러 감도
 setting.saveinterval.name = 자동저장 간격
 setting.seconds = 초
 setting.fullscreen.name = 전체 화면
+setting.borderless.name = Borderless Window
 setting.fps.name = FPS 표시
 setting.vsync.name = VSync 활성화
 setting.lasers.name = 전력 노드 레이저 표시
@@ -561,12 +570,12 @@ block.sandrocks.name = 모래 바위
 block.spore-pine.name = 포자 소나무
 block.sporerocks.name = 포자 바위
 block.rock.name = 바위
+block.snowrock.name = Snow Rock
 block.shale.name = 이판암
 block.shale-boulder.name = 둥근 이판암
 block.moss.name = 이끼
 block.spore-moss.name = 포자 이끼
 block.shalerocks.name = 이판암 바위
-block.snowrock.name = Snow Rock
 block.scrap-wall.name = 조각벽
 block.scrap-wall-large.name = 큰 조각벽
 block.scrap-wall-huge.name = 거대한 조각 벽
@@ -586,10 +595,12 @@ block.water.name = 물
 block.tar.name = 타르
 block.stone.name = 돌
 block.sand.name = 모래
+block.darksand.name = Dark Sand
 block.ice.name = 얼음
 block.snow.name = 눈
 block.craters.name = 크레이터
 block.sand-water.name = 젖은모래
+block.darksand-water.name = Dark Sand Water
 block.char.name = 숯
 block.holostone.name = 홀로스톤
 block.ice-snow.name = 얼음눈
@@ -621,6 +632,7 @@ block.thorium-wall-large.name = 대형 토륨벽
 block.door.name = 문
 block.door-large.name = 대형문
 block.duo.name = 듀오
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = 헤일
 block.lancer.name = 랜서

core/assets/bundles/bundle_nl.properties

@@ -406,6 +406,7 @@ category.crafting = Crafting
 category.shooting = Shooting
 category.optional = Optional Enhancements
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Autosave Interval
 setting.seconds = {0} Seconds
 setting.fullscreen.name = Fullscreen
+setting.borderless.name = Borderless Window
 setting.fps.name = Show FPS
 setting.vsync.name = VSync
 setting.lasers.name = Show Power Lasers
@@ -593,10 +595,12 @@ block.water.name = Water
 block.tar.name = Tar
 block.stone.name = Stone
 block.sand.name = Dark Sand
+block.darksand.name = Dark Sand
 block.ice.name = Ice
 block.snow.name = Snow
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Large Thorium Wall
 block.door.name = Door
 block.door-large.name = Large Door
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer

core/assets/bundles/bundle_pl.properties

@@ -406,6 +406,7 @@ category.crafting = Przetwórstwo
 category.shooting = Strzelanie
 category.optional = Ulepszenia Nieobowiąskowe
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Wskaźniki Przyjaciół
 setting.autotarget.name = Automatyczne Celowanie
 setting.fpscap.name = Maksymalny FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Czułość kontrolera
 setting.saveinterval.name = Interwał automatycznego zapisywania
 setting.seconds = Sekundy
 setting.fullscreen.name = Pełny ekran
+setting.borderless.name = Borderless Window
 setting.fps.name = Widoczny licznik FPS
 setting.vsync.name = Synchronizacja pionowa
 setting.lasers.name = Pokaż lasery zasilające
@@ -593,10 +595,12 @@ block.water.name = Woda
 block.tar.name = Smoła
 block.stone.name = Kamień
 block.sand.name = Piasek
+block.darksand.name = Dark Sand
 block.ice.name = Lód
 block.snow.name = Śnieg
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Duża Torowa Ściana
 block.door.name = Drzwi
 block.door-large.name = Duże drzwi
 block.duo.name = Podwójne działko
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Święte działko
 block.lancer.name = Lancer

core/assets/bundles/bundle_pt_BR.properties

@@ -406,6 +406,7 @@ category.crafting = Construindo
 category.shooting = Atirando
 category.optional = Melhoras opcionais
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Alvo automatico
 setting.fpscap.name = FPS Maximo
@@ -424,6 +425,7 @@ setting.sensitivity.name = Sensibilidade do Controle
 setting.saveinterval.name = Intervalo de autosalvamento
 setting.seconds = {0} Segundos
 setting.fullscreen.name = Tela Cheia
+setting.borderless.name = Borderless Window
 setting.fps.name = Mostrar FPS
 setting.vsync.name = VSync
 setting.lasers.name = Mostrar lasers
@@ -593,10 +595,12 @@ block.water.name = Água
 block.tar.name = Tar
 block.stone.name = Pedra
 block.sand.name = Areia
+block.darksand.name = Dark Sand
 block.ice.name = Gelo
 block.snow.name = Neve
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Parede larga de tório
 block.door.name = Porta
 block.door-large.name = Porta Grande
 block.duo.name = Dupla
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancador

core/assets/bundles/bundle_ru.properties

@@ -21,10 +21,8 @@ stat.destroyed = Строений уничтожено:[accent] {0}
 stat.deconstructed = Строений деконструировано:[accent] {0}
 stat.delivered = Ресурсов добыто:
 stat.rank = Финальный Счёт: [accent]{0}
-
 placeline = Вы выбрали блок.\nВы можете[accent] строить в линию[], сначало[accent] удерживая палец в течение нескольких секунд[] и потом перетаскивая его.\n\nПопробуйте.
 removearea = Вы выбрали режим удаления.\nВы можете[accent] удалать блоки по прямоугольнику[], [accent]удерживая палец несколько секунд[] и потом перетаскивая его.\n\nПопробуйте.
-
 map.delete = Вы действительно хотите удалить карту "[accent]{0}[]"?
 level.highscore = Рекорд: [accent]{0}
 level.select = Выбор карты
@@ -408,6 +406,7 @@ category.crafting = Ввод/вывод
 category.shooting = Cтрельба
 category.optional = Дополнительные улучшения
 setting.animatedwater.name = Анимированная вода
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Показывать в сторону союзников и врагов 
 setting.autotarget.name = Авто-стрельба
 setting.fpscap.name = Макс. FPS
@@ -426,6 +425,7 @@ setting.sensitivity.name = Чувствительность контроллер
 setting.saveinterval.name = Интервал автосохранения
 setting.seconds = {0} Секунд
 setting.fullscreen.name = Полноэкранный режим
+setting.borderless.name = Borderless Window
 setting.fps.name = Показывать FPS
 setting.vsync.name = Верт. синхронизация
 setting.lasers.name = Показывать энергию лазеров
@@ -595,10 +595,12 @@ block.water.name = Вода
 block.tar.name = Дёготь
 block.stone.name = Камень
 block.sand.name = Тёмный песок
+block.darksand.name = Dark Sand
 block.ice.name = Лёд
 block.snow.name = Снег
 block.craters.name = Кратеры
 block.sand-water.name = Песок с водой
+block.darksand-water.name = Dark Sand Water
 block.char.name = Выжженная Земля
 block.holostone.name = Голографический камень
 block.ice-snow.name = Ледяной Снег

core/assets/bundles/bundle_tk.properties

@@ -406,6 +406,7 @@ category.crafting = uretim
 category.shooting = sikma
 category.optional = Optional Enhancements
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Kumanda hassasligi
 setting.saveinterval.name = Otomatik kaydetme suresi
 setting.seconds = {0} Saniye
 setting.fullscreen.name = Tam ekran
+setting.borderless.name = Borderless Window
 setting.fps.name = FPS'i goster
 setting.vsync.name = VSync
 setting.lasers.name = Guc lazerlerini goster
@@ -593,10 +595,12 @@ block.water.name = su
 block.tar.name = Tar
 block.stone.name = tas
 block.sand.name = kum
+block.darksand.name = Dark Sand
 block.ice.name = buz
 block.snow.name = kar
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = genis toryum duvari
 block.door.name = kapi
 block.door-large.name = genis kapi
 block.duo.name = ikili
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = yagdirici
 block.lancer.name = Lazer topu

core/assets/bundles/bundle_tr.properties

@@ -406,6 +406,7 @@ category.crafting = Crafting
 category.shooting = Shooting
 category.optional = Optional Enhancements
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Denetleyici hassasiyeti
 setting.saveinterval.name = Otomatik Kaydetme Aralığı
 setting.seconds = saniye
 setting.fullscreen.name = Tam ekran
+setting.borderless.name = Borderless Window
 setting.fps.name = Saniyede ... Kare göstermek
 setting.vsync.name = VSync
 setting.lasers.name = Güç Lazerleri Göster
@@ -593,10 +595,12 @@ block.water.name = water
 block.tar.name = Tar
 block.stone.name = stone
 block.sand.name = sand
+block.darksand.name = Dark Sand
 block.ice.name = ice
 block.snow.name = snow
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Large Thorium Wall
 block.door.name = kapı
 block.door-large.name = büyük kapı
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer

core/assets/bundles/bundle_uk_UA.properties

@@ -406,6 +406,7 @@ category.crafting = Введення/виведення
 category.shooting = Стрільба
 category.optional = Додаткові поліпшення
 setting.animatedwater.name = Анімована вода
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Показувати у сторону ворогів та союзників
 setting.autotarget.name = Авто-стрільба
 setting.fpscap.name = Макс. FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = Чутливість контролера
 setting.saveinterval.name = Інтервал автозбереження
 setting.seconds = {0} сек.
 setting.fullscreen.name = Повноекранний режим
+setting.borderless.name = Borderless Window
 setting.fps.name = Показувати FPS
 setting.vsync.name = Вертикальна синхронізація
 setting.lasers.name = Показувати енергію лазерів
@@ -593,10 +595,12 @@ block.water.name = Вода
 block.tar.name = Tar
 block.stone.name = Камінь
 block.sand.name = Темний пісок
+block.darksand.name = Dark Sand
 block.ice.name = Лід
 block.snow.name = Сніг
 block.craters.name = Кратери
 block.sand-water.name = Пісок з водою
+block.darksand-water.name = Dark Sand Water
 block.char.name = Випалена Земля
 block.holostone.name = Голографічний камінь
 block.ice-snow.name = Крижаний Сніг
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = Велика торієва стіна
 block.door.name = Двері
 block.door-large.name = Великі двері
 block.duo.name = Подвійна
+block.scorch.name = Scorch
 block.scatter.name = Розсіювач
 block.hail.name = Град
 block.lancer.name = Списоносець

core/assets/bundles/bundle_zh_CN.properties

@@ -406,6 +406,7 @@ category.crafting = 制造
 category.shooting = 发射
 category.optional = 可选的增强物品
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = 队友指示器
 setting.autotarget.name = 自动发射
 setting.fpscap.name = 最高 FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = 控制器灵敏度
 setting.saveinterval.name = 自动保存间隔
 setting.seconds = {0} 秒
 setting.fullscreen.name = 全屏
+setting.borderless.name = Borderless Window
 setting.fps.name = 显示 FPS
 setting.vsync.name = 帧同步
 setting.lasers.name = 显示能量射线
@@ -593,10 +595,12 @@ block.water.name = 水
 block.tar.name = Tar
 block.stone.name = 石头
 block.sand.name = 沙子
+block.darksand.name = Dark Sand
 block.ice.name = 冰
 block.snow.name = 雪
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = 大型钍墙
 block.door.name = 门
 block.door-large.name = 大门
 block.duo.name = 双管炮
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = 冰雹炮
 block.lancer.name = 蓝瑟炮

core/assets/bundles/bundle_zh_TW.properties

@@ -406,6 +406,7 @@ category.crafting = 合成
 category.shooting = 射擊
 category.optional = 可選的強化
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = 盟友指標
 setting.autotarget.name = 自動射擊
 setting.fpscap.name = 最大FPS
@@ -424,6 +425,7 @@ setting.sensitivity.name = 控制器靈敏度
 setting.saveinterval.name = 自動存檔間隔
 setting.seconds = {0}秒
 setting.fullscreen.name = 全螢幕
+setting.borderless.name = Borderless Window
 setting.fps.name = 顯示FPS
 setting.vsync.name = 垂直同步
 setting.lasers.name = 顯示雷射光束
@@ -593,10 +595,12 @@ block.water.name = 水
 block.tar.name = 焦油
 block.stone.name = 石頭
 block.sand.name = 沙
+block.darksand.name = Dark Sand
 block.ice.name = 冰
 block.snow.name = 雪
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -628,6 +632,7 @@ block.thorium-wall-large.name = 大型釷牆
 block.door.name = 門
 block.door-large.name = 大門
 block.duo.name = 雙炮
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = 冰雹炮
 block.lancer.name = 藍瑟炮

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

@@ -869,7 +869,7 @@ public class Blocks implements ContentList{
         batteryLarge = new Battery("battery-large"){{
             requirements(Category.power, ItemStack.with(Items.titanium, 40, Items.lead, 80, Items.silicon, 30));
             size = 3;
-            consumes.powerBuffered(20000f, 1f);
+            consumes.powerBuffered(37440f, 1f);
         }};
 
         combustionGenerator = new BurnerGenerator("combustion-generator"){{
@@ -914,13 +914,13 @@ public class Blocks implements ContentList{
 
         solarPanel = new SolarGenerator("solar-panel"){{
             requirements(Category.power, ItemStack.with(Items.lead, 20, Items.silicon, 30));
-            powerProduction = 0.045f;
+            powerProduction = 0.06f;
         }};
 
         largeSolarPanel = new SolarGenerator("solar-panel-large"){{
             requirements(Category.power, ItemStack.with(Items.lead, 200, Items.silicon, 290, Items.phasefabric, 30));
             size = 3;
-            powerProduction = 0.55f;
+            powerProduction = 0.9f;
         }};
 
         thoriumReactor = new NuclearReactor("thorium-reactor"){{
@@ -1359,7 +1359,7 @@ public class Blocks implements ContentList{
         //region units
 
         spiritFactory = new UnitFactory("spirit-factory"){{
-            requirements(Category.units, ItemStack.with(Items.copper, 70, Items.lead, 110, Items.silicon, 130));
+            requirements(Category.units, ItemStack.with(Items.copper, 70, Items.lead, 110, Items.silicon, 80));
             type = UnitTypes.spirit;
             produceTime = 5700;
             size = 2;

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

@@ -263,7 +263,7 @@ public class TechTree implements ContentList{
     private TechNode node(Block block, Runnable children){
         ItemStack[] requirements = new ItemStack[block.buildRequirements.length];
         for(int i = 0; i < requirements.length; i++){
-            requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 8);
+            requirements[i] = new ItemStack(block.buildRequirements[i].item, block.buildRequirements[i].amount * 6);
         }
         
         return new TechNode(block, requirements, children);

core/src/io/anuke/mindustry/editor/EditorTile.java

@@ -88,6 +88,14 @@ public class EditorTile extends Tile{
     protected void changed(){
         entity = null;
 
+        if(wall == null){
+            wall = Blocks.air;
+        }
+
+        if(floor == null){
+            floor = (Floor)Blocks.air;
+        }
+
         Block block = block();
 
         if(block.hasEntity()){

core/src/io/anuke/mindustry/editor/WaveInfoDialog.java

@@ -166,7 +166,7 @@ public class WaveInfoDialog extends FloatingDialog{
                     t.table(p -> {
                         p.add("$waves.every").padRight(4);
                         p.addField(group.spacing + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePostiveInt(text)){
+                            if(Strings.canParsePostiveInt(text) && Strings.parseInt(text) > 0){
                                 group.spacing = Strings.parseInt(text);
                                 updateWaves();
                             }
@@ -228,7 +228,7 @@ public class WaveInfoDialog extends FloatingDialog{
                 dialog.hide();
                 buildGroups();
             }).pad(2).margin(12f).fillX();
-            if(++i % 2 == 0)dialog.cont.row();
+            if(++i % 3 == 0)dialog.cont.row();
         }
         dialog.show();
     }

core/src/io/anuke/mindustry/game/DefaultWaves.java

@@ -14,18 +14,18 @@ public class DefaultWaves{
             spawns = Array.with(
                 new SpawnGroup(UnitTypes.dagger){{
                     end = 8;
-                    unitScaling = 2;
+                    unitScaling = 1.5f;
                 }},
 
                 new SpawnGroup(UnitTypes.wraith){{
                     begin = 12;
                     end = 14;
-                    unitScaling = 2;
+                    unitScaling = 1f;
                 }},
 
                 new SpawnGroup(UnitTypes.dagger){{
                     begin = 11;
-                    unitScaling = 2;
+                    unitScaling = 1.7f;
                     spacing = 2;
                     max = 4;
                 }},
@@ -43,7 +43,6 @@ public class DefaultWaves{
                     unitScaling = 1;
                     unitAmount = 1;
                     spacing = 2;
-                    end = 30;
                 }},
 
                 new SpawnGroup(UnitTypes.titan){{
@@ -73,7 +72,7 @@ public class DefaultWaves{
                     unitScaling = 1;
                     spacing = 2;
 
-                    max = 7;
+                    max = 12;
                 }},
 
                 new SpawnGroup(UnitTypes.dagger){{
@@ -90,15 +89,14 @@ public class DefaultWaves{
                     unitAmount = 1;
                     unitScaling = 3;
                     effect = StatusEffects.shielded;
-                    max = 10;
                 }},
 
                 new SpawnGroup(UnitTypes.fortress){{
                     begin = 40;
                     spacing = 5;
                     unitAmount = 2;
-                    unitScaling = 3;
-                    max = 10;
+                    unitScaling = 2;
+                    max = 20;
                 }},
 
                 new SpawnGroup(UnitTypes.dagger){{
@@ -150,16 +148,21 @@ public class DefaultWaves{
                     unitScaling = 3;
                     spacing = 4;
                     max = 8;
-                    end = 74;
+                }},
+
+                new SpawnGroup(UnitTypes.eruptor){{
+                    begin = 31;
+                    unitAmount = 4;
+                    unitScaling = 1;
+                    spacing = 3;
                 }},
 
                 new SpawnGroup(UnitTypes.ghoul){{
-                    begin = 53;
+                    begin = 90;
                     unitAmount = 2;
                     unitScaling = 3;
                     spacing = 4;
                     max = 8;
-                    end = 74;
                 }}
             );
         }

core/src/io/anuke/mindustry/io/MapIO.java

@@ -69,25 +69,25 @@ public class MapIO{
 
     public static Pixmap generatePreview(Map map) throws IOException{
         Time.mark();
-        Pixmap floor = new Pixmap(map.width, map.height, Format.RGBA8888);
-        Pixmap wall = new Pixmap(map.width, map.height, Format.RGBA8888);
+        Pixmap floors = new Pixmap(map.width, map.height, Format.RGBA8888);
+        Pixmap walls = new Pixmap(map.width, map.height, Format.RGBA8888);
         int black = Color.rgba8888(Color.BLACK);
         CachedTile tile = new CachedTile(){
             @Override
             public void setFloor(Floor type){
-                floor.drawPixel(x, floor.getHeight() - 1 - y, colorFor(type, Blocks.air, Blocks.air, getTeam()));
+                floors.drawPixel(x, floors.getHeight() - 1 - y, colorFor(type, Blocks.air, Blocks.air, getTeam()));
             }
 
             @Override
             public void setOreByte(byte b){
-                if(b != 0) floor.drawPixel(x, floor.getHeight() - 1 - y, colorFor(floor(), Blocks.air, content.block(b), getTeam()));
+                if(b != 0) floors.drawPixel(x, floors.getHeight() - 1 - y, colorFor(floor(), Blocks.air, content.block(b), getTeam()));
             }
 
             @Override
             protected void changed(){
                 super.changed();
                 int c = colorFor(Blocks.air, block(), Blocks.air, getTeam());
-                if(c != black) wall.drawPixel(x, floor.getHeight() - 1 - y, c);
+                if(c != black) walls.drawPixel(x, floors.getHeight() - 1 - y, c);
             }
         };
         readTiles(map, (x, y) -> {
@@ -95,9 +95,9 @@ public class MapIO{
             tile.y = (short)y;
             return tile;
         });
-        floor.drawPixmap(wall, 0, 0);
-        wall.dispose();
-        return floor;
+        floors.drawPixmap(walls, 0, 0);
+        walls.dispose();
+        return floors;
     }
 
     public static Pixmap generatePreview(Tile[][] tiles){

core/src/io/anuke/mindustry/ui/fragments/HudFragment.java

@@ -16,13 +16,13 @@ import io.anuke.arc.scene.ui.ImageButton;
 import io.anuke.arc.scene.ui.TextButton;
 import io.anuke.arc.scene.ui.layout.Stack;
 import io.anuke.arc.scene.ui.layout.Table;
+import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.scene.utils.Elements;
 import io.anuke.arc.util.Align;
 import io.anuke.arc.util.Scaling;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.Tmp;
 import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.game.EventType.PlayEvent;
 import io.anuke.mindustry.game.EventType.StateChangeEvent;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.gen.Call;
@@ -49,16 +49,6 @@ public class HudFragment extends Fragment{
     private float coreAttackTime;
     private float lastCoreHP;
     private float coreAttackOpacity = 0f;
-    private Table goshDarnHeckingFlippedTableWhyDoesThisHappen;
-
-    {
-        Events.on(PlayEvent.class, event -> {
-            if(goshDarnHeckingFlippedTableWhyDoesThisHappen != null){
-                goshDarnHeckingFlippedTableWhyDoesThisHappen.invalidateHierarchy();
-                goshDarnHeckingFlippedTableWhyDoesThisHappen.pack();
-            }
-        });
-    }
 
     public void build(Group parent){
 
@@ -67,8 +57,13 @@ public class HudFragment extends Fragment{
             cont.top().left().visible(() -> !state.is(State.menu));
 
             if(mobile){
-                cont.table(select -> {
-                    goshDarnHeckingFlippedTableWhyDoesThisHappen = select;
+
+                {
+                    Table select = new Table(){
+                        public float getPrefWidth(){ return Unit.dp.scl(dsize*4 + 3); }
+                        public float getPrefHeight(){ return Unit.dp.scl(dsize); }
+                    };
+
                     select.left();
                     select.defaults().size(dsize).left();
 
@@ -111,7 +106,8 @@ public class HudFragment extends Fragment{
                     }).get();
 
                     select.addImage("blank").color(Pal.accent).width(3f).fillY();
-                }).left();
+                    cont.add(select).prefSize(dsize*4 + 3, dsize).left();
+                }
 
                 cont.row();
                 cont.addImage("blank").height(3f).color(Pal.accent).fillX();

core/src/io/anuke/mindustry/world/Build.java

@@ -153,7 +153,7 @@ public class Build{
                     Tile other = world.tile(x + dx + offsetx, y + dy + offsety);
                     if(other == null || (other.block() != Blocks.air && !other.block().alwaysReplace) ||
                             !other.floor().placeableOn ||
-                            (other.floor().isLiquid && !type.floating)){
+                            (other.floor().isDeep() && !type.floating)){
                         return false;
                     }
                 }
@@ -162,7 +162,7 @@ public class Build{
         }else{
             return tile.interactable(team)
                     && contactsGround(tile.x, tile.y, type)
-                    && (!tile.floor().isLiquid || type.floating)
+                    && (!tile.floor().isDeep() || type.floating)
                     && tile.floor().placeableOn
                     && ((type.canReplace(tile.block())
                     && !(type == tile.block() && rotation == tile.getRotation() && type.rotate)) || tile.block().alwaysReplace || tile.block() == Blocks.air)
@@ -174,19 +174,19 @@ public class Build{
         if(block.isMultiblock()){
             for(Point2 point : Edges.getInsideEdges(block.size)){
                 Tile tile = world.tile(x + point.x, y + point.y);
-                if(tile != null && !tile.floor().isLiquid) return true;
+                if(tile != null && !tile.floor().isDeep()) return true;
             }
 
             for(Point2 point : Edges.getEdges(block.size)){
                 Tile tile = world.tile(x + point.x, y + point.y);
-                if(tile != null && !tile.floor().isLiquid) return true;
+                if(tile != null && !tile.floor().isDeep()) return true;
             }
         }else{
             for(Point2 point : Geometry.d4){
                 Tile tile = world.tile(x + point.x, y + point.y);
-                if(tile != null && !tile.floor().isLiquid) return true;
+                if(tile != null && !tile.floor().isDeep()) return true;
             }
-            return world.tile(x, y) != null && !world.tile(x, y).floor().isLiquid;
+            return world.tile(x, y) != null && !world.tile(x, y).floor().isDeep();
         }
         return false;
     }

core/src/io/anuke/mindustry/world/Tile.java

@@ -34,8 +34,8 @@ public class Tile implements Position, TargetTrait{
     /** Tile entity, usually null. */
     public TileEntity entity;
     public short x, y;
-    private Block wall;
-    private Floor floor;
+    protected Block wall;
+    protected Floor floor;
     /** Rotation, 0-3. Also used to store offload location, in which case it can be any number. */
     private byte rotation;
     /** Team ordinal. */

core/src/io/anuke/mindustry/world/blocks/Floor.java

@@ -118,6 +118,9 @@ public class Floor extends Block{
         }
     }
 
+    public boolean isDeep(){
+        return drownTime > 0;
+    }
 
     public void drawNonLayer(Tile tile){
         Mathf.random.setSeed(tile.pos());

core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java

@@ -10,7 +10,6 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
-import io.anuke.arc.math.geom.Point2;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.entities.type.Player;
 import io.anuke.mindustry.entities.type.TileEntity;
@@ -94,18 +93,6 @@ public class ItemBridge extends Block{
         if(world.tile(x, y) != null && linkValid(world.tile(x, y), world.tile(lastPlaced)) && lastPlaced != Pos.get(x, y)){
             return world.tile(lastPlaced);
         }
-
-        for(int j = 0; j < 4; j ++){
-            Point2 p = Geometry.d4(j + 1);
-            for(int i = 1; i <= range; i++){
-                Tile tile = world.tile(x + p.x * i, y + p.y * i);
-
-                if(tile == null) break;
-                if(tile.block() == this && !(tile.x == x && tile.y == y) && tile.entity != null && tile.<ItemBridgeEntity>entity().link == Pos.invalid){
-                    return tile;
-                }
-            }
-        }
         return null;
     }
 

desktop/build.gradle

@@ -69,6 +69,12 @@ task dist(type: Jar){
     }
 }
 
+task ttt(){
+    fileTree("/home/anuke/Projects/Mindustry/deploy/Mindustry-Linux64-4-beta-66/jre/lib/amd64/newst").each{t ->
+        println("\"jre/lib/amd64/${t.absoluteFile.name}\",")
+    }
+}
+
 //note: call desktop:dist beforehand
 task packrCmd(){
 
@@ -83,6 +89,8 @@ task packrCmd(){
             outDir = file("packr-out/")
             mainClass = project.ext.mainClassName
             classpath = ["desktop/build/libs/desktop-release.jar"]
+            removePlatformLibs = ["desktop/build/libs/desktop-release.jar"]
+
             vmArgs = ["Djava.net.preferIPv4Stack=true"]
             minimizeJre = "desktop/packr_minimize.json"
             jdk = JDK_DIR + "jdk-${getPlatform().toString().toLowerCase()}.zip"
@@ -136,11 +144,11 @@ task packrZip(){
 
     if(project.hasProperty("platform")){
 
-        if(getPlatform() == "mac"){
+        if(getPlatform() == PackrConfig.Platform.MacOS){
             dependsOn "fixMac"
         }
 
-        if(getPlatform() == "windows32"){
+        if(getPlatform() == PackrConfig.Platform.Windows32){
             dependsOn "fixWindows32"
         }
 

desktop/packr_minimize.json

@@ -23,9 +23,17 @@
 		"javax/accessibility",
         "com/sun/corba",
         "com/sun/jmx",
+        "com/sun/org",
+        "com/sun/imageio",
         "com/sun/jndi",
         "com/sun/xml",
         "com/sun/script",
+        "sum/awt",
+        "sun/java2d",
+        "sun/font",
+        "sun/rmi",
+        "sun/swing",
+        "java/util/stream",
         "com/sun/media",
         "com/sun/naming",
         "java/awt",
@@ -67,7 +75,35 @@
       "paths": [
         "jre/lib/amd64/libawt.so",
         "jre/lib/amd64/libawt_xawt.so",
-        "jre/lib/amd64/libjawt.so"
+        "jre/lib/amd64/libjawt.so",
+        "jre/lib/amd64/libhprof.so",
+        "jre/lib/amd64/libdt_socket.so",
+        "jre/lib/amd64/libsplashscreen.so",
+        "jre/lib/amd64/libunpack.so",
+        "jre/lib/amd64/liblcms.so",
+        "jre/lib/amd64/libnpt.so",
+        "jre/lib/amd64/libmlib_image.so",
+        "jre/lib/amd64/libjsig.so",
+        "jre/lib/amd64/libinstrument.so",
+        "jre/lib/amd64/libjaas_unix.so",
+        "jre/lib/amd64/libj2pcsc.so",
+        "jre/lib/amd64/libsaproc.so",
+        "jre/lib/amd64/libsunec.so",
+        "jre/lib/amd64/libj2pkcs11.so",
+        "jre/lib/amd64/libjsdt.so",
+        "jre/lib/amd64/libjdwp.so",
+        "jre/lib/amd64/libjava_crw_demo.so",
+        "jre/lib/amd64/libfreetype.so",
+        "jre/lib/amd64/libmanagement.so",
+        "jre/lib/amd64/libsctp.so",
+        "jre/lib/amd64/libj2gss.so",
+        "jre/lib/amd64/libjpeg.so",
+        "jre/lib/amd64/libfreetype.so.6",
+        "jre/lib/amd64/libjsoundalsa.so",
+        "jre/lib/amd64/libjsound.so",
+        "jre/lib/amd64/libattach.so",
+        "jre/lib/amd64/libawt_headless.so",
+        "jre/lib/amd64/libfontmanager.so"
       ]
     },
     {

server/src/io/anuke/mindustry/server/ServerControl.java

@@ -198,7 +198,7 @@ public class ServerControl implements ApplicationListener{
 
             if(lastTask != null) lastTask.cancel();
 
-            Map result = world.maps.all().find(map -> map.name().equalsIgnoreCase(arg[0]));
+            Map result = world.maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' ')) || map.name().equalsIgnoreCase(arg[0]));
 
             if(result == null){
                 err("No map with name &y'{0}'&lr found.", arg[0]);