4.21.14

Author: yairm210

android/assets/jsons/translations/Hindi.properties

@@ -6738,7 +6738,6 @@ Gaur = गौड़
 Gwalior = ग्वालियर
 Jaipur = जयपुर
 Karachi = कराची
- # Requires translation!
 India = भारत
 
  # Requires translation!

android/assets/jsons/translations/Indonesian.properties

@@ -1472,13 +1472,9 @@ Add or move to the top in all cities = Tambahkan atau pindahkan ke atas antrean
 Remove from the queue in all cities = Hapus dari antrean di semua kota
 Disable = Matikan
 Enable = Nyalakan
- # Requires translation!
 Disable in this city = Matikan di kota ini
- # Requires translation!
 Enable in this city = Nyalakan di kota ini
- # Requires translation!
 Disable in all cities = Matikan di semua kota
- # Requires translation!
 Enable in all cities = Nyalakan di semua kota
 
 # Specialized Popups - Ask for text or numbers, file picker

android/assets/jsons/translations/Simplified_Chinese.properties

@@ -432,21 +432,16 @@ Enable Nuclear Weapons = 启用核武器
 No City Razing = 禁止摧毁城市
 No Barbarians = 无蛮族
 Disable starting bias = 禁用起始地形
- # Requires translation!
 City-states search for first city location = 城邦寻找首个城市位置
 Raging Barbarians = 狂暴蛮族
 No Ancient Ruins = 无远古遗迹
 No Natural Wonders = 无自然奇观
 Allow anyone to spectate = 允许所有人观战
- # Requires translation!
 Show Civilization Stats = 显示统计数据
 Show Rankings = 显示排名
 Show Demographics = 显示人口
- # Requires translation!
 Show Charts = 显示图表
- # Requires translation!
 Restrict to own civilization = 仅限自身文明
- # Requires translation!
 Show additional stat types = 显示额外统计类型
 Victory Conditions = 胜利方式
 Scientific = 科技
@@ -1151,7 +1146,6 @@ We have captured a barbarian encampment and recovered [goldAmount] gold! = 我
 An enemy [unitType] has joined us! = 一个敌方[unitType]加入了我们！
 [unitName] can be promoted! = [unitName]可晋升了！
 [unitName] has fully healed = [unitName]已痊愈！
- # Requires translation!
 [amount] units can be promoted! = [amount]个单位可以被晋升！
 
 # This might be needed for a rewrite of Germany's unique - see #7376
@@ -1188,9 +1182,7 @@ We have allied with [nation]. = 我们已和[nation]缔结同盟
 # Deprecated as of August 2026
 We have lost alliance with [nation]. = 我们和[nation]不再是同盟关系
 
- # Requires translation!
 We have lost our alliance with [cityStateName]. = 我们和[cityStateName]不再是同盟关系
- # Requires translation!
 We have lost our alliance with [cityStateName] to [civName]. = [cityStateName]的同盟关系被[civName]夺走
 We have discovered [naturalWonder]! = 大发现！我们发现了[naturalWonder]!
 We have received [goldAmount] Gold for discovering [naturalWonder] = 我们因发现[naturalWonder]获得了 [goldAmount] 金钱
@@ -1266,7 +1258,6 @@ from the ruins = 从遗迹中，
 
 # World Screen UI
 
- # Requires translation!
 Retry Upload = 重新上传
 Working... = 进行中...
 Waiting for other players... = 等待其他玩家...
@@ -1357,7 +1348,6 @@ Culture = 文化
 Science = 科研
 Faith = 信仰
 
- # Requires translation!
 Tiles Explored = 已探索地块
 
 Growth = 人口增长
@@ -1386,9 +1376,7 @@ Social policies = 社会政策
 Close = 关闭
 Do you want to exit the game? = 你想退出游戏吗？
 Exit = 退出
- # Requires translation!
 Start bias: = 起始偏好
- # Requires translation!
 Avoid [terrain] = 避开[terrain]地形
 
 # Maya calendar popup
@@ -1408,7 +1396,6 @@ Buy = 购买
 Move unit out of city first = 先把单位移出城市
 Currently you have [amount] [stat]. = 你目前有[amount][stat]。
 Would you like to purchase [constructionName] for [buildingGoldCost] [stat]? = 你确定用[buildingGoldCost][stat]购买[constructionName]吗？
- # Requires translation!
 Buy [amount] tiles in ring [ring] for [cost][stat] = 花费[cost]个[stat]，购买[ring]环内的[amount]块地块
 You are buying a religious unit in a city that doesn't follow the religion you founded ([yourReligion]). This means that the unit is tied to that foreign religion ([majorityReligion]) and will be less useful. = 您正在在一个不信仰您创立的宗教([yourReligion])的城市购买一个异教([majorityReligion])宗教单位，可能不太实用。
 Are you really sure you want to purchase this unit? = 您确认要购买这单位吗?
@@ -1487,13 +1474,9 @@ Add or move to the top in all cities = 添加或移至 所有城市的队列顶
 Remove from the queue in all cities = 从所有城市的队列中移除
 Disable = 禁用
 Enable = 启用
- # Requires translation!
 Disable in this city = 此城市禁用
- # Requires translation!
 Enable in this city = 此城市启用
- # Requires translation!
 Disable in all cities = 所有城市禁用
- # Requires translation!
 Enable in all cities = 所有城市启用
 
 # Specialized Popups - Ask for text or numbers, file picker
@@ -1956,7 +1939,6 @@ Religions already founded = 已建立的宗教
 Available founder beliefs = 可用的创始人信仰
 Available follower beliefs = 可用的追随者信仰
 Religious status: = 宗教进度
- # Requires translation!
 Majority Religion = 主流宗教
 
 None = 无

android/assets/jsons/translations/completionPercentages.properties

@@ -4,7 +4,7 @@ Afrikaans = 37
 Bangla = 46
 Belarusian = 41
 Bosnian = 33
-Brazilian_Portuguese = 99
+Brazilian_Portuguese = 100
 Bulgarian = 60
 Catalan = 99
 Croatian = 96
@@ -18,9 +18,9 @@ French = 99
 Galician = 99
 German = 97
 Greek = 40
-Hindi = 36
-Hungarian = 99
-Indonesian = 99
+Hindi = 37
+Hungarian = 100
+Indonesian = 100
 Italian = 99
 Japanese = 97
 Korean = 93

changelog.md

@@ -1,26 +1,19 @@
 ## 4.21.14
 
-chore: Clearer "on dispose wait for autosave", doesn't solve the problem but does clear up what the problem is
+Fixed minimap problems when spectating-as-civ
 
-Fixed part of  - Fixed minimap problems when spectating-as-civ
+Avoid future ANRs from screen-switching
 
-Missed Android screen whoops
+reject ruleset objects that replace themselves - By mvanhorn
 
-Generic'd and default'd "Avoid ANRs by disabling input" by having all screen pushes send a constructor function instead of an instance
+Record client version of latest turn submitted by each civ in Multiplayer - By unciv-loof
 
 By SomeTroglodyte:
-- Fix "Connect road" with A-Star pathing enabled 
-- Allow assigning "key" mappings to extra mouse buttons 
-- Fix equalizeColumns for empty lower tables 
-- More screens support the "F1" binding to Civilopedia 
-
-fix: reject ruleset objects that replace themselves - By mvanhorn
-
-mdae the idle unit cycle button a view (maybe??) - By varchasgopalaswamy
-
-(MP) Record client version of latest turn submitted by each civ - By unciv-loof
-
-PathingMap cleanup and linting - By Ambeco
+- Fix "Connect road" with A-Star pathing enabled
+- Allow assigning "key" mappings to extra mouse buttons
+- More screens support the "F1" binding to Civilopedia
+- Prevent double terrain damage from healing
+- Fix equalizeColumns for empty lower tables
 
 ## 4.21.13
 

core/src/com/unciv/UncivGame.kt

@@ -431,17 +431,15 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
 
         settings.save()
 
-        if (gameInfo != null) {
-            val autoSaveJob = files.autosaves.autoSaveJob
-            if (autoSaveJob != null && autoSaveJob.isActive) {
-                // onPause() call always precedes dispose() call so auto save is already in progress
-                // This is the primary cause of ANRs at the moment - 
-                //   we need some way to have the autosave keep working but remove the other threads,
-                // I'm not sure what the right way is, we can either not clear daemon threads
-                // or we can cancel the job if it takes too long...?
-                Concurrency.runBlocking { 
-                    autoSaveJob.join()
-                }
+        val autoSaveJob = files.autosaves.autoSaveJob
+        if (autoSaveJob != null && autoSaveJob.isActive) {
+            // onPause() call always precedes dispose() call so auto save is already in progress
+            // This is the primary cause of ANRs at the moment - 
+            //   we need some way to have the autosave keep working but remove the other threads,
+            // I'm not sure what the right way is, we can either not clear daemon threads
+            // or we can cancel the job if it takes too long...?
+            Concurrency.runBlocking { 
+                autoSaveJob.join()
             }
         }
         Concurrency.stopThreadPools()

fastlane/metadata/android/en-US/changelogs/1255.txt

@@ -1,23 +1,14 @@
+Fixed minimap problems when spectating-as-civ
 
+Avoid future ANRs from screen-switching
 
-chore: Clearer "on dispose wait for autosave", doesn't solve the problem but does clear up what the problem is
+reject ruleset objects that replace themselves - By mvanhorn
 
-Fixed part of  - Fixed minimap problems when spectating-as-civ
-
-Missed Android screen whoops
-
-Generic'd and default'd "Avoid ANRs by disabling input" by having all screen pushes send a constructor function instead of an instance
+Record client version of latest turn submitted by each civ in Multiplayer - By unciv-loof
 
 By SomeTroglodyte:
-- Fix "Connect road" with A-Star pathing enabled 
-- Allow assigning "key" mappings to extra mouse buttons 
-- Fix equalizeColumns for empty lower tables 
-- More screens support the "F1" binding to Civilopedia 
-
-fix: reject ruleset objects that replace themselves - By mvanhorn
-
-mdae the idle unit cycle button a view (maybe??) - By varchasgopalaswamy
-
-(MP) Record client version of latest turn submitted by each civ - By unciv-loof
-
-PathingMap cleanup and linting - By Ambeco
+- Fix "Connect road" with A-Star pathing enabled
+- Allow assigning "key" mappings to extra mouse buttons
+- More screens support the "F1" binding to Civilopedia
+- Prevent double terrain damage from healing
+- Fix equalizeColumns for empty lower tables