Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_be.properties

@@ -343,6 +343,7 @@ command.rebuild = Перабудоўваць
 command.assist = Следаваць За Гульцом
 command.move = Рухацца
 command.boost = Узляцець
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_bg.properties

@@ -348,6 +348,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_ca.properties

@@ -348,6 +348,7 @@ command.rebuild = Reconstrueix
 command.assist = Assisteix al jugador
 command.move = Mou
 command.boost = Sobrevola
+command.enterPayload = Enter Payload Block
 command.loadUnits = Carrega unitats
 command.loadBlocks = Carrega blocs
 command.unloadPayload = Descarrega

core/assets/bundles/bundle_cs.properties

@@ -348,6 +348,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_da.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_de.properties

@@ -351,6 +351,7 @@ command.rebuild = Wiederaufbauen
 command.assist = Spieler unterstützen
 command.move = Bewegen
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_es.properties

@@ -348,6 +348,7 @@ command.rebuild = Reconstruir
 command.assist = Asistir al jugador
 command.move = Moverse
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_et.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_eu.properties

@@ -346,6 +346,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_fi.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_fil.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_fr.properties

@@ -354,6 +354,7 @@ command.rebuild = Reconstruire
 command.assist = Assister
 command.move = Bouger
 command.boost = Booster
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_hu.properties

@@ -347,6 +347,7 @@ command.rebuild = Újraépítés
 command.assist = Segítség játékosnak
 command.move = Mozgás
 command.boost = Boost-olás
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_id_ID.properties

@@ -348,6 +348,7 @@ command.rebuild = Bangun Kembali
 command.assist = Bantu Pemain
 command.move = Maju
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_it.properties

@@ -346,6 +346,7 @@ command.rebuild = Ricostruisci
 command.assist = Aiuta giocatore
 command.move = Muovi
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_ja.properties

@@ -348,6 +348,7 @@ command.rebuild = 再建築
 command.assist = プレイヤーをアシスト
 command.move = 移動
 command.boost = ブースト
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_ko.properties

@@ -348,6 +348,7 @@ command.rebuild = 재건
 command.assist = 플레이어 지원
 command.move = 이동
 command.boost = 비행
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_lt.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_nl.properties

@@ -352,6 +352,7 @@ command.rebuild = Herbouw
 command.assist = Assist Speler
 command.move = Beweeg
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_nl_BE.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_pl.properties

@@ -348,6 +348,7 @@ command.rebuild = Odbudowywuj
 command.assist = Asystuj Graczowi
 command.move = Przemieść
 command.boost = Przyspiesz
+command.enterPayload = Enter Payload Block
 command.loadUnits = Załaduj Jednostki
 command.loadBlocks = Załaduj Bloki
 command.unloadPayload = Rozładuj Ładunek

core/assets/bundles/bundle_pt_BR.properties

@@ -348,6 +348,7 @@ command.rebuild = Reconstruir
 command.assist = Assist Player
 command.move = Mover
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_pt_PT.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_ro.properties

@@ -348,6 +348,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_ru.properties

@@ -348,6 +348,7 @@ command.rebuild = Восстанавливать
 command.assist = Помогать игроку
 command.move = Двигаться
 command.boost = Лететь
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_sr.properties

@@ -348,6 +348,7 @@ command.rebuild = Ponovna Gradnja
 command.assist = Pomoć Igraču
 command.move = Kretanje
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_sv.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_th.properties

@@ -348,6 +348,7 @@ command.rebuild = สร้างใหม่
 command.assist = ช่วยเหลือผู้เล่น
 command.move = ขยับ
 command.boost = บูสต์
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_tk.properties

@@ -344,6 +344,7 @@ command.rebuild = Rebuild
 command.assist = Assist Player
 command.move = Move
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_tr.properties

@@ -348,6 +348,7 @@ command.rebuild = Yeniden İnşaa Et
 command.assist = Oyuncuya Yardım Et
 command.move = Hareket Et
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Birim Yükle
 command.loadBlocks = Blok Yükle
 command.unloadPayload = Birim Bırak

core/assets/bundles/bundle_uk_UA.properties

@@ -350,6 +350,7 @@ command.rebuild = Відбудовувати
 command.assist = Допомагати гравцеві
 command.move = Рухатися
 command.boost = Летіти
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_vi.properties

@@ -349,6 +349,7 @@ command.rebuild = Xây Dựng
 command.assist = Hỗ Trợ Người Chơi
 command.move = Di Chuyển
 command.boost = Tăng Cường
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_zh_CN.properties

@@ -351,6 +351,7 @@ command.rebuild = 重建
 command.assist = 协助建造
 command.move = 移动
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

core/assets/bundles/bundle_zh_TW.properties

@@ -348,6 +348,7 @@ command.rebuild = 重建
 command.assist = 協助玩家
 command.move = 移動
 command.boost = Boost
+command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
 command.loadBlocks = Load Blocks
 command.unloadPayload = Unload Payload

servers_v7.json

@@ -5,7 +5,7 @@
   },
   {
     "name": "meiqiuMDT",
-    "address": ["43.248.103.156:11023","211.101.236.94:10000","bj-1.lcf.icu:10240"]
+    "address": ["43.248.103.156:14740","211.101.236.94:10000","bj-1.lcf.icu:10240"]
   },
   {
     "name": "CMS",
@@ -246,7 +246,7 @@
   },
   {
     "name": "Open PVP",
-    "address": ["185.250.44.200:6567"]
+    "address": ["162.55.42.21:5555"]
   },
   {
     "name": "XuwenHost",