diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 06ebb4fec9..cfde2e1ec7 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2552,8 +2552,7 @@ Porcelain Tower = Torre de Porcelana Windmill = Moinho de vento Kremlin = Kremlin - # Requires translation! -'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = 'O Kremlin está constantemente mudando as regras do jogo para atender aos seus propósitos. Não estamos jogando xadrez, estamos jogando roleta'. - Garry Kasparov Museum = Museu diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 2feba85a96..edcf336375 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2553,7 +2553,7 @@ Windmill = Kincir Angin Kremlin = Kremlin # Requires translation! -'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = 'Kremlin terus-menerus mengubah aturan main agar sesuai dengan tujuannya. Kami tidak bermain catur, kami bermain rolet.' - Garry Kasparov Museum = Museum diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 9258e215bb..ca7a011382 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -218,7 +218,7 @@ City-States grow wary of your aggression. The resting point for Influence has de [cityState] is deeply grateful for your assistance in the war against [civName]! = [cityState] безмерно благодарны вам за помощь в войне против державы [civName]! [cityState] no longer needs your assistance against [civName]. = [cityState] больше не нуждается в вашей помощи против державы [civName]. War against [civName] = Воюет против [civName] -We need you to help us defend against [civName]. Killing [amount] of their military units would slow their offensive. = Нам нужно, чтобы вы помогли на защититься от [civName]. Уничтожение [amount] военных юнитов замедлит их наступление. +We need you to help us defend against [civName]. Killing [amount] of their military units would slow their offensive. = Нам нужно, чтобы вы помогли нам защититься от [civName]. Уничтожение [amount] военных юнитов замедлит их наступление. Currently you have killed [amount] of their military units. = На данный момент уничтожено [amount] военных юнитов. You need to find them first! = Сначала их надо найти! diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 96a56354bb..95f5d4f0b1 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.8.0" const val appName = "Unciv" - const val appCodeNumber = 864 - const val appVersion = "4.6.10-patch2" + const val appCodeNumber = 865 + const val appVersion = "4.6.11" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 5406c9ffb7..3bcae79368 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,24 @@ +## 4.6.11 + +Resolved - update UI after founding city when breaking promise + +4.6.10-patch2 + +4.6.10-patch1 + +By SomeTroglodyte: +- Fix 4.6.10 no longer loading older games +- Policy images in red text, policy branch icons in pedia +- Prevent some state changing actions during next-turn + +Added a fix for to complete a game turn and set upToDate for last human player - By CrsiX + +By alexban011: +- ci: added Detekt code analysis +- Fixed a couple warnings reported by code analysis + +Add `May not annex cities` unique - By Skekdog + ## 4.6.10 Automated workers no longer stay on unimprovable tile if another tile is improvable diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 5f56fd1545..185a984d71 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -531,7 +531,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.6.10-patch2", 864) + val VERSION = Version("4.6.11", 865) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/865.txt b/fastlane/metadata/android/en-US/changelogs/865.txt new file mode 100644 index 0000000000..59ed0df47e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/865.txt @@ -0,0 +1,20 @@ + + +Resolved - update UI after founding city when breaking promise + +4.6.10-patch2 + +4.6.10-patch1 + +By SomeTroglodyte: +- Fix 4.6.10 no longer loading older games +- Policy images in red text, policy branch icons in pedia +- Prevent some state changing actions during next-turn + +Added a fix for to complete a game turn and set upToDate for last human player - By CrsiX + +By alexban011: +- ci: added Detekt code analysis +- Fixed a couple warnings reported by code analysis + +Add `May not annex cities` unique - By Skekdog \ No newline at end of file