From e0d7128bc627f725f94233af08545bc8ec79e7dd Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 23 Mar 2021 23:01:00 +0200
Subject: [PATCH] 3.13.11

---
 .../translations/Brazilian_Portuguese.properties   |  2 ++
 android/assets/jsons/translations/Czech.properties |  2 ++
 android/assets/jsons/translations/Dutch.properties |  2 ++
 .../assets/jsons/translations/English.properties   |  2 ++
 .../assets/jsons/translations/Finnish.properties   |  2 ++
 .../assets/jsons/translations/French.properties    |  2 ++
 .../assets/jsons/translations/German.properties    |  2 ++
 .../assets/jsons/translations/Hungarian.properties |  2 ++
 .../jsons/translations/Indonesian.properties       |  2 ++
 .../assets/jsons/translations/Italian.properties   |  2 ++
 .../assets/jsons/translations/Japanese.properties  |  2 ++
 .../assets/jsons/translations/Korean.properties    |  2 ++
 .../jsons/translations/Lithuanian.properties       |  2 ++
 android/assets/jsons/translations/Malay.properties |  2 ++
 .../translations/Persian_(Pinglish-DIN).properties |  2 ++
 .../translations/Persian_(Pinglish-UN).properties  |  2 ++
 .../assets/jsons/translations/Polish.properties    |  2 ++
 .../jsons/translations/Portuguese.properties       |  2 ++
 .../assets/jsons/translations/Romanian.properties  |  2 ++
 .../assets/jsons/translations/Russian.properties   |  2 ++
 .../translations/Simplified_Chinese.properties     |  2 ++
 .../assets/jsons/translations/Spanish.properties   |  2 ++
 .../translations/Traditional_Chinese.properties    |  2 ++
 .../assets/jsons/translations/Turkish.properties   |  2 ++
 .../assets/jsons/translations/Ukrainian.properties |  2 ++
 buildSrc/src/main/kotlin/BuildConfig.kt            |  4 ++--
 changelog.md                                       | 14 +++++++++++++-
 27 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 9df50875ec..81d6c0c2fc 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -4119,6 +4119,8 @@ Rifleman = Fuzileiro
 
 Carrier = Porta-aviões
 Can carry 2 aircraft = Pode carregar 2 espaçonaves
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Aeronave triplano
 [amount]% chance to intercept air attacks = [amount]% de chance de interceptar ataques aéreos
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index a04b401306..3a12179f5d 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -3498,6 +3498,8 @@ Rifleman = Střelec s puškou
 
 Carrier = Letadlová loď
 Can carry 2 aircraft = Uveze 2 letadla
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Trojplošník
 [amount]% chance to intercept air attacks = [amount]% šance zabránit leteckým útokům
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index e9616b12c8..647ac6f6de 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -5420,6 +5420,8 @@ Rifleman =
 Carrier = 
  # Requires translation!
 Can carry 2 aircraft = 
+ # Requires translation!
+Cannot attack = 
 
  # Requires translation!
 Triplane = 
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index dd20bd5f45..e4044b282b 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -6359,6 +6359,8 @@ Rifleman =
  # Requires translation!
 Carrier = 
 Can carry 2 aircraft = Can carry 2 aircraft
+ # Requires translation!
+Cannot attack = 
 
  # Requires translation!
 Triplane = 
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 7c2687bab8..40a40e9816 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -4565,6 +4565,8 @@ Rifleman =
 
 Carrier = Lentotukialus
 Can carry 2 aircraft = Voi kantaa kahta lentokonetta
+ # Requires translation!
+Cannot attack = 
 
  # Requires translation!
 Triplane = 
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index faa76bb85f..1e4bc22d28 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -3652,6 +3652,8 @@ Rifleman = Fusilier
 
 Carrier = Porte-avions
 Can carry 2 aircraft = Peut transporter 2 avions
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Triplan
 [amount]% chance to intercept air attacks = [amount]% chance d'intercepter une attaque aérienne
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 0dc4290070..5dd3c1fd05 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -3476,6 +3476,8 @@ Rifleman = Gewehrschütze
 
 Carrier = Flugzeugträger
 Can carry 2 aircraft = Kann 2 Flugzeuge tragen
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Dreidecker
 [amount]% chance to intercept air attacks = [amount]% Chance, Luftangriffe abzufangen
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 7b37e9d875..52fc1d32fc 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -4185,6 +4185,8 @@ Rifleman = Lövész
 
 Carrier = Anyahajó
 Can carry 2 aircraft = 2 repülő egységet tud magával vinni
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Háromfedeles
 [amount]% chance to intercept air attacks = [amount]% esély, hogy meggátolja a légi támadásokat
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index d83a82c1e4..468e8de165 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -3476,6 +3476,8 @@ Rifleman = Rifleman
 
 Carrier = Kapal Induk
 Can carry 2 aircraft = Bisa membawa 2 pesawat
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Triplane
 [amount]% chance to intercept air attacks = [amount]% kemungkinan untuk mencegah serangan udara
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index b04ce95b80..9e02f6dec3 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -3475,6 +3475,8 @@ Rifleman = Fuciliere
 
 Carrier = Portaerei
 Can carry 2 aircraft = Trasporta due unità aeree
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Triplano
 [amount]% chance to intercept air attacks = [amount]% probabilità di intercettare attacchi aerei
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index 654c0c7c17..17e205a22c 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -3512,6 +3512,8 @@ Rifleman = ライフル兵
 
 Carrier = 航空母艦
 Can carry 2 aircraft = 航空ユニットの輸送スロット2つ追加
+ # Requires translation!
+Cannot attack = 
 
 Triplane = 三翼飛行機
 [amount]% chance to intercept air attacks = [amount]%で空襲を阻止できる
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 20fd8422a3..0e76156761 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -3518,6 +3518,8 @@ Rifleman = 소총병
 
 Carrier = 항공모함
 Can carry 2 aircraft = 공중 유닛 2대 수송 가능
+ # Requires translation!
+Cannot attack = 
 
 Triplane = 1차 세계대전 전투기
 [amount]% chance to intercept air attacks = 공중 공격을 [amount]% 확률로 요격함
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index 14dd373aed..0dc3b2be9e 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -5665,6 +5665,8 @@ Rifleman =
 Carrier = 
  # Requires translation!
 Can carry 2 aircraft = 
+ # Requires translation!
+Cannot attack = 
 
  # Requires translation!
 Triplane = 
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index dbf872917b..de332b394c 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -5985,6 +5985,8 @@ Rifleman =
 
 Carrier = Pengangkut
 Can carry 2 aircraft = Boleh bawa 2 kapal terbang
+ # Requires translation!
+Cannot attack = 
 
  # Requires translation!
 Triplane = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index 954b39c855..c384cf8b95 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -5597,6 +5597,8 @@ Rifleman =
 Carrier = 
  # Requires translation!
 Can carry 2 aircraft = 
+ # Requires translation!
+Cannot attack = 
 
  # Requires translation!
 Triplane = 
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index d89a2f78e6..25bed6e023 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -5594,6 +5594,8 @@ Rifleman =
 Carrier = 
  # Requires translation!
 Can carry 2 aircraft = 
+ # Requires translation!
+Cannot attack = 
 
  # Requires translation!
 Triplane = 
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index d9c2738063..2f5576209a 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -3617,6 +3617,8 @@ Rifleman = Strzelec
 
 Carrier = Lotniskowiec
 Can carry 2 aircraft = Może przenieść dwa samoloty
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Trójpłat
 [amount]% chance to intercept air attacks = [amount]% szans na przechwycenie ataku w powietrzu
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index 4cacebc7dd..fc5a1e87ce 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -4955,6 +4955,8 @@ Rifleman = Fuzileiro
 
 Carrier = Porta-aviões
 Can carry 2 aircraft = Pode carregar 2 espaçonaves
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Aeronave triplano
 [amount]% chance to intercept air attacks = [amount]% de chance de interceptar ataques aéreos
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index 5fe231ef18..382f83f6e2 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -5205,6 +5205,8 @@ Rifleman = Carabinier
 
 Carrier = Portavion
 Can carry 2 aircraft = Poate căra 2 avioane
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Triplan
 [amount]% chance to intercept air attacks = [amount]% șansă de interceptare a atacurilor aeriene
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index 362f5bfd94..3a4a35621b 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -3517,6 +3517,8 @@ Rifleman = Стрелок
 
 Carrier = Авианосец
 Can carry 2 aircraft = Может транспортировать 2 авиационных единицы
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Триплан
 [amount]% chance to intercept air attacks = [amount]% шанс перехвата воздушных атак
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 62a9dd97db..1e41437e2d 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -3479,6 +3479,8 @@ Rifleman = 来复枪兵
 
 Carrier = 航空母舰
 Can carry 2 aircraft = 可搭载2个空军单位
+ # Requires translation!
+Cannot attack = 
 
 Triplane = 三翼机
 [amount]% chance to intercept air attacks = [amount]%几率拦截来袭的敌军飞机
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index ada7d85d1d..a7218e330f 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -3480,6 +3480,8 @@ Rifleman = Fusilero
 
 Carrier = Porta Aviones
 Can carry 2 aircraft = Puede transportar 2 aviones
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Triplano
 [amount]% chance to intercept air attacks = [amount]% de posibilidad de interceptar ataques aéreos
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index 0e7de5fe0a..f379ef0f68 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -3479,6 +3479,8 @@ Rifleman = 來福槍兵
 
 Carrier = 航空母艦
 Can carry 2 aircraft = 可搭載2個空軍單位
+ # Requires translation!
+Cannot attack = 
 
 Triplane = 三翼機
 [amount]% chance to intercept air attacks = [amount]%幾率攔截來襲的敵軍飛機
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 1c37314b06..a15be24468 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -4083,6 +4083,8 @@ Rifleman = Tüfekli asker
 
 Carrier = Uçak Gemisi
 Can carry 2 aircraft = 2 uçak taşıyabilir
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Üçlü uçak 
 [amount]% chance to intercept air attacks = hava saldırılarını engelleme şansı [amount]%
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index de830ba5fd..83114b0c9c 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -3482,6 +3482,8 @@ Rifleman = Карабінер
 
 Carrier = Авіаносець
 Can carry 2 aircraft = Може нести 2 літаки
+ # Requires translation!
+Cannot attack = 
 
 Triplane = Триплан
 [amount]% chance to intercept air attacks = Можливе перехоплення повітряних атак [amount]%
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index c30ec88205..a93c449ff4 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.4.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 548
-    const val appVersion = "3.13.10"
+    const val appCodeNumber = 549
+    const val appVersion = "3.13.11"
 
     const val gdxVersion = "1.9.14"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index f49798a48d..e1b00dd04b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,16 @@
+## 3.13.11
+
+Resolved #3732 - Mark target tile while moving toward it
+
+Resolved #3734 - "Loading" popup when loading game remains until game is fully loaded
+
+Resolved #3735 - The civ launching - not receiving - the nuke is considered the civ that declared war
+
+Resolved #3721 - Fixed edge-case "images are temporarily applied from mods set in other places"
+
+Resolved #3722 - fixed resistance icon display in notifications
+
+Carriers cannot attack - By lishaoxia1985
 
 ## 3.13.10
 
@@ -7,7 +20,6 @@ Resolved #3713 - Fixed misspelled "fresh water" in farm unique check
 
 Barbarians only heal by pillaging, simplified barbarian automation
 
-
 ## 3.13.9
 
 Added "permanent visual mods" option to mod management