Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_be.properties

@@ -1105,6 +1105,7 @@ settings.data = Гульнявыя Дадзеныя
 settings.reset = Скінуць Налады 
 settings.rebind = Змяніць
 settings.resetKey = Скінуць
+settings.unbindKey = Unbind
 settings.controls = Кіраванне
 settings.game = Гульня
 settings.sound = Гук

core/assets/bundles/bundle_bg.properties

@@ -1105,6 +1105,7 @@ settings.data = Данни на играта
 settings.reset = Върни към стандартните настройки
 settings.rebind = Смени
 settings.resetKey = Нулирай
+settings.unbindKey = Unbind
 settings.controls = Управление
 settings.game = Игра
 settings.sound = Звук

core/assets/bundles/bundle_ca.properties

@@ -1105,6 +1105,7 @@ settings.data = Dades del joc
 settings.reset = Restableix els valors per defecte
 settings.rebind = Canvia
 settings.resetKey = Restableix
+settings.unbindKey = Unbind
 settings.controls = Controls
 settings.game = Joc
 settings.sound = So

core/assets/bundles/bundle_cs.properties

@@ -1105,6 +1105,7 @@ settings.data = Data hry
 settings.reset = Nastavit na původní hodnoty
 settings.rebind = Změnit
 settings.resetKey = Původní
+settings.unbindKey = Unbind
 settings.controls = Ovládání
 settings.game = Hra
 settings.sound = Zvuky

core/assets/bundles/bundle_da.properties

@@ -1105,6 +1105,7 @@ settings.data = Spildata
 settings.reset = Nulstil til standard
 settings.rebind = Rebind
 settings.resetKey = Nulstil
+settings.unbindKey = Unbind
 settings.controls = Styring
 settings.game = Spil
 settings.sound = Lyd

core/assets/bundles/bundle_de.properties

@@ -1105,6 +1105,7 @@ settings.data = Spieldaten
 settings.reset = Auf Standard zurücksetzen
 settings.rebind = Zuweisen
 settings.resetKey = Zurücksetzen
+settings.unbindKey = Unbind
 settings.controls = Steuerung
 settings.game = Spiel
 settings.sound = Audio

core/assets/bundles/bundle_es.properties

@@ -1105,6 +1105,7 @@ settings.data = Datos del juego
 settings.reset = Reiniciar a los valores por defecto
 settings.rebind = Reasignar
 settings.resetKey = Reiniciar
+settings.unbindKey = Unbind
 settings.controls = Controles
 settings.game = Juego
 settings.sound = Sonido

core/assets/bundles/bundle_et.properties

@@ -1105,6 +1105,7 @@ settings.data = Mänguandmed
 settings.reset = Vaikimisi sätted
 settings.rebind = Muuda
 settings.resetKey = Reset
+settings.unbindKey = Unbind
 settings.controls = Juhtnupud
 settings.game = Mäng
 settings.sound = Heli

core/assets/bundles/bundle_eu.properties

@@ -1105,6 +1105,7 @@ settings.data = Jolasaren datuak
 settings.reset = Berrezarri lehenespenak
 settings.rebind = Aldatu
 settings.resetKey = Berrezarri
+settings.unbindKey = Unbind
 settings.controls = Kontrolak
 settings.game = Jolasa
 settings.sound = Soinua

core/assets/bundles/bundle_fi.properties

@@ -1105,6 +1105,7 @@ settings.data = Peli Data
 settings.reset = Nollaa Asetukset
 settings.rebind = Uudelleenaseta
 settings.resetKey = Aseta Uudelleen
+settings.unbindKey = Unbind
 settings.controls = Kontrollit
 settings.game = Peli
 settings.sound = Ääni

core/assets/bundles/bundle_fil.properties

@@ -1105,6 +1105,7 @@ settings.data = Game Data
 settings.reset = I-Reset sa mga Default
 settings.rebind = I-Rebind
 settings.resetKey = I-Reset
+settings.unbindKey = Unbind
 settings.controls = Mga Controls
 settings.game = Game
 settings.sound = Sound

core/assets/bundles/bundle_fr.properties

@@ -1105,6 +1105,7 @@ settings.data = Données du Jeu
 settings.reset = Valeurs par Défaut
 settings.rebind = Réattribuer
 settings.resetKey = Réinitialiser
+settings.unbindKey = Unbind
 settings.controls = Contrôles
 settings.game = Jeu
 settings.sound = Son

core/assets/bundles/bundle_hu.properties

@@ -1105,6 +1105,7 @@ settings.data = Játékadatok
 settings.reset = Alapértelmezés
 settings.rebind = Átállítás
 settings.resetKey = Vissza-\nállítás
+settings.unbindKey = Unbind
 settings.controls = Irányítás
 settings.game = Játék
 settings.sound = Hangok

core/assets/bundles/bundle_id_ID.properties

@@ -1105,6 +1105,7 @@ settings.data = Data Game
 settings.reset = Atur Ulang ke Bawaan
 settings.rebind = Ganti Tombol
 settings.resetKey = Atur Ulang
+settings.unbindKey = Unbind
 settings.controls = Kontrol
 settings.game = Permainan
 settings.sound = Suara

core/assets/bundles/bundle_it.properties

@@ -1105,6 +1105,7 @@ settings.data = Dati di Gioco
 settings.reset = Ripristina Predefiniti
 settings.rebind = Cambia tasti
 settings.resetKey = Ripristina
+settings.unbindKey = Unbind
 settings.controls = Controlli
 settings.game = Gioco
 settings.sound = Audio

core/assets/bundles/bundle_ja.properties

@@ -1105,6 +1105,7 @@ settings.data = ゲームデータ
 settings.reset = デフォルトにリセット
 settings.rebind = 再設定
 settings.resetKey = リセット
+settings.unbindKey = Unbind
 settings.controls = コントロール
 settings.game = ゲーム
 settings.sound = サウンド

core/assets/bundles/bundle_ko.properties

@@ -1105,6 +1105,7 @@ settings.data = 게임 데이터
 settings.reset = 기본값으로 초기화
 settings.rebind = 설정
 settings.resetKey = 초기화
+settings.unbindKey = Unbind
 settings.controls = 조작
 settings.game = 게임
 settings.sound = 소리

core/assets/bundles/bundle_lt.properties

@@ -1105,6 +1105,7 @@ settings.data = Žaidimo Duomenys
 settings.reset = Atkurti į numatytuosius
 settings.rebind = Keisti
 settings.resetKey = Atkuri
+settings.unbindKey = Unbind
 settings.controls = Valdymas
 settings.game = Žaidimas
 settings.sound = Garsai

core/assets/bundles/bundle_nl.properties

@@ -1105,6 +1105,7 @@ settings.data = Spelgegevens
 settings.reset = Terug naar standaardinstellingen
 settings.rebind = Verander
 settings.resetKey = Reset
+settings.unbindKey = Unbind
 settings.controls = Bediening
 settings.game = Spel
 settings.sound = Geluid

core/assets/bundles/bundle_nl_BE.properties

@@ -1105,6 +1105,7 @@ settings.data = Game Data
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
 settings.resetKey = Reset
+settings.unbindKey = Unbind
 settings.controls = Controls
 settings.game = Game
 settings.sound = Sound

core/assets/bundles/bundle_pl.properties

@@ -1105,6 +1105,7 @@ settings.data = Dane Gry
 settings.reset = Przywróć Domyślne
 settings.rebind = Zmień
 settings.resetKey = Resetuj
+settings.unbindKey = Unbind
 settings.controls = Sterowanie
 settings.game = Gra
 settings.sound = Dźwięk

core/assets/bundles/bundle_pt_BR.properties

@@ -1105,6 +1105,7 @@ settings.data = Dados do jogo
 settings.reset = Restaurar Padrões
 settings.rebind = Religar
 settings.resetKey = Resetar
+settings.unbindKey = Unbind
 settings.controls = Controles
 settings.game = Jogo
 settings.sound = Som

core/assets/bundles/bundle_pt_PT.properties

@@ -1105,6 +1105,7 @@ settings.data = Dados do jogo
 settings.reset = Restaurar Padrões
 settings.rebind = Religar
 settings.resetKey = Repor
+settings.unbindKey = Unbind
 settings.controls = Controlos
 settings.game = Jogo
 settings.sound = Som

core/assets/bundles/bundle_ro.properties

@@ -1105,6 +1105,7 @@ settings.data = Datele Jocului
 settings.reset = Resetează
 settings.rebind = Reatribuie
 settings.resetKey = Resetează
+settings.unbindKey = Unbind
 settings.controls = Controale
 settings.game = Joc
 settings.sound = Sunet

core/assets/bundles/bundle_ru.properties

@@ -1105,6 +1105,7 @@ settings.data = Игровые данные
 settings.reset = Сбросить по умолчанию
 settings.rebind = Сменить
 settings.resetKey = Сбросить
+settings.unbindKey = Unbind
 settings.controls = Управление
 settings.game = Игра
 settings.sound = Звук

core/assets/bundles/bundle_sr.properties

@@ -1105,6 +1105,7 @@ settings.data = Podaci
 settings.reset = Vrati na podrazumevano
 settings.rebind = Rebind
 settings.resetKey = Resetuj
+settings.unbindKey = Unbind
 settings.controls = Kontrole
 settings.game = Igra
 settings.sound = Zvuk

core/assets/bundles/bundle_sv.properties

@@ -1105,6 +1105,7 @@ settings.data = Spel Data
 settings.reset = Återställ till Standardvärden
 settings.rebind = Byt
 settings.resetKey = Reset
+settings.unbindKey = Unbind
 settings.controls = Kontroller
 settings.game = Spel
 settings.sound = Ljud

core/assets/bundles/bundle_th.properties

@@ -1105,6 +1105,7 @@ settings.data = ข้อมูลเกม
 settings.reset = รีเซ็ตเป็นค่าเริ่มต้น
 settings.rebind = แก้ไขปุ่ม
 settings.resetKey = รีเซ็ต
+settings.unbindKey = Unbind
 settings.controls = การควบคุม
 settings.game = เกม
 settings.sound = เสียง

core/assets/bundles/bundle_tk.properties

@@ -1105,6 +1105,7 @@ settings.data = Game Data
 settings.reset = ilk ayarlara geri al
 settings.rebind = Geri al
 settings.resetKey = Reset
+settings.unbindKey = Unbind
 settings.controls = Kontroller
 settings.game = Oyun
 settings.sound = Ses

core/assets/bundles/bundle_tr.properties

@@ -1105,6 +1105,7 @@ settings.data = Oyun Verisi
 settings.reset = Varsayılana Sıfırla
 settings.rebind = Tuşları Yeniden Ata
 settings.resetKey = Tuşu Sıfırla
+settings.unbindKey = Unbind
 settings.controls = Kontroller
 settings.game = Oyun
 settings.sound = Ses

core/assets/bundles/bundle_uk_UA.properties

@@ -1105,6 +1105,7 @@ settings.data = Ігрові дані
 settings.reset = За замовчуванням
 settings.rebind = Змінити
 settings.resetKey = Скинути
+settings.unbindKey = Unbind
 settings.controls = Керування
 settings.game = Гра
 settings.sound = Звук

core/assets/bundles/bundle_vi.properties

@@ -1105,6 +1105,7 @@ settings.data = Dữ Liệu Trò Chơi
 settings.reset = Khôi phục về Mặc định
 settings.rebind = Gán lại
 settings.resetKey = Đặt lại
+settings.unbindKey = Unbind
 settings.controls = Điều Khiển
 settings.game = Trò Chơi
 settings.sound = Âm Thanh

core/assets/bundles/bundle_zh_CN.properties

@@ -524,10 +524,10 @@ editor.filters.search = 在特定关键词中进行搜索：
 editor.filters.author = 作者
 editor.filters.description = 描述
 editor.filters.modname = 模组名称
-editor.filters.prioritize.name = Prioritize: Name
-editor.filters.prioritize.custom = Prioritize: Custom
-editor.filters.prioritize.builtin = Prioritize: Built-In
-editor.filters.prioritize.recent = Prioritize: Recently Modified
+editor.filters.prioritize.name = 优先级：名称
+editor.filters.prioritize.custom = 优先级：自定义
+editor.filters.prioritize.builtin = 优先级：内置
+editor.filters.prioritize.recent = 优先级：最近修改
 editor.filters.planetselect = 选择星球
 editor.shiftx = X 轴平移
 editor.shifty = Y 轴平移
@@ -1098,13 +1098,14 @@ status.fast.name = 迅捷
 status.shielded.name = 保护
 status.disarmed.name = 缴械
 status.invincible.name = 无敌
-status.dynamic.name = 动态效果
+status.dynamic.name = 动态
 
 settings.language = 语言
 settings.data = 数据
 settings.reset = 全部恢复默认
 settings.rebind = 重新绑定
 settings.resetKey = 恢复默认
+settings.unbindKey = Unbind
 settings.controls = 控制
 settings.game = 游戏
 settings.sound = 声音
@@ -2664,8 +2665,8 @@ block.large-logic-display.description = 显示处理器中绘制的各种图像
 block.tile-logic-display.description = 显示处理器中绘制的各种图像。\n图像能无缝显示到附近的逻辑显示单元。
 block.interplanetary-accelerator.description = 一个巨大的电磁轨道加速器。将核心加速至逃逸速度以进行星际部署。
 block.repair-turret.description = 持续修复范围内受损的单位。可以用冷却液强化。
-block.target-dummy.name = 测试假人
-block.target-dummy.description = 生成一个测试假人来测试DPS（每秒伤害）。可设置是否有护甲或飞行能力。\n仅限沙盒模式。
+block.target-dummy.name = 标靶
+block.target-dummy.description = 生成一个标靶来测试DPS（每秒伤害）。可设置是否有护甲或飞行能力。\n仅限沙盒模式。
 
 #Erekir
 block.core-bastion.description = 基地的核心。拥有装甲。一旦被摧毁，该区块就会丢失。

core/assets/bundles/bundle_zh_TW.properties

@@ -1105,6 +1105,7 @@ settings.data = 遊戲資料
 settings.reset = 重設為預設值
 settings.rebind = 重新綁定
 settings.resetKey = 重設按鍵
+settings.unbindKey = Unbind
 settings.controls = 控制
 settings.game = 遊戲
 settings.sound = 音效

core/src/mindustry/world/blocks/defense/TargetDummy.java

@@ -131,7 +131,7 @@ public class TargetDummy extends Block{
                 unit.hitSize = dummySize;
 
                 //similar to impulseNet but does not factor in mass
-                Tmp.v1.set(this).sub(unit).limit(dst(unit) * pullScale * Time.delta);
+                Tmp.v1.set(this).sub(unit).limit(dst(unit) * pullScale);
                 unit.vel.add(Tmp.v1);
 
                 //manually move units to simulate velocity for remote players