From 235fe86b72a7cf13bfb501bb90855865eeb42a03 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 12 Jun 2023 19:14:19 +0300 Subject: [PATCH] Version rollout (#9573) * Bump version and create initial changelog entry * Updated Brazilian_Portuguese.properties (#9572) * Update Polish.properties (#9568) * Update French.properties (#9567) * Update Italian.properties (#9566) --------- Co-authored-by: yairm210 Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Ouaz Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 21 +++++-------- .../jsons/translations/French.properties | 14 ++++----- .../jsons/translations/Italian.properties | 21 +++++-------- .../jsons/translations/Polish.properties | 14 ++++----- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +-- changelog.md | 31 +++++++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/878.txt | 30 ++++++++++++++++++ 8 files changed, 92 insertions(+), 45 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/878.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index cabf6f21fc..c29f1ddc2d 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -296,10 +296,8 @@ Non-existent city = Cidade inexistente # Unit differences [resourceName] not required = [resourceName] não requirido - # Requires translation! -Lost ability (vs [originalUnit]): [ability] = - # Requires translation! -Upgrade all [count] [unit] ([cost] gold) = +Lost ability (vs [originalUnit]): [ability] = Habilidade perdida (vs [originalUnit]): [ability] +Upgrade all [count] [unit] ([cost] gold) = Atualize tudo [count] [unit] ([cost] ouro) National ability = Habilidade nacional [firstValue] vs [secondValue] = [firstValue] vs [secondValue] Gained = Ganhou @@ -521,8 +519,7 @@ Current map: World Wrap = Mapa atual: Envoltório Mundial Overlay image = Imagem de sobreposição Click to choose a file = Clique para escolher um arquivo Choose an image = Escolha uma imagem - # Requires translation! -Overlay opacity: = +Overlay opacity: = Opacidade da sobreposição: Invalid overlay image = Imagem de sobreposição inválida World wrap is incompatible with an overlay and was deactivated. = Envoltório mundial é incompatível com uma sobreposição e foi desativado. An overlay image is incompatible with world wrap and was deactivated. = Uma imagem de sobreposição é incompatível com a quebra do mundo e foi desativada. @@ -788,12 +785,9 @@ Currently playing: [title] = Atualmente tocando: [title] Download music = Baixar música Downloading... = Baixando... Could not download music! = Não foi possível baixar a música! - # Requires translation! -—Paused— = - # Requires translation! -—Default— = - # Requires translation! -—History— = +—Paused— = -Pausado- +—Default— = -Padrão- +—History— = -História- ## Advanced tab Advanced = Avançado @@ -1390,8 +1384,7 @@ Allied with [civName] = Aliado a [civName] Civilization Info = Informações da civilizção Relations = Relações Trade request = Solicitação de troca - # Requires translation! -Garrisoned by unit = +Garrisoned by unit = Guarnecido por unidade # Victory diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index de95dd8428..2330bfe940 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -297,9 +297,9 @@ Non-existent city = Ville inexistante [resourceName] not required = [resourceName] non requis # Requires translation! -Lost ability (vs [originalUnit]): [ability] = +Lost ability (vs [originalUnit]): [ability] = Compétence perdue (vs [originalUnit]) : [ability] # Requires translation! -Upgrade all [count] [unit] ([cost] gold) = +Upgrade all [count] [unit] ([cost] gold) = Améliorer les [count] [unit] ([cost] or) National ability = Compétence nationale [firstValue] vs [secondValue] = [firstValue] vs [secondValue] Gained = Gagne @@ -522,7 +522,7 @@ Overlay image = Image superposée Click to choose a file = Cliquer pour choisir un fichier Choose an image = Choisir une image # Requires translation! -Overlay opacity: = +Overlay opacity: = Opacité de l'image : Invalid overlay image = Image non valide World wrap is incompatible with an overlay and was deactivated. = La carte sphérique a été désactivée car incompatible avec une image superposée. An overlay image is incompatible with world wrap and was deactivated. = L'image superposée a été désactivée car incompatible avec une carte sphérique. @@ -789,11 +789,11 @@ Download music = Télécharger la musique Downloading... = Téléchargement... Could not download music! = Impossible de télécharger la musique ! # Requires translation! -—Paused— = +—Paused— = —En pause— # Requires translation! -—Default— = +—Default— = —Défaut— # Requires translation! -—History— = +—History— = —Historique— ## Advanced tab Advanced = Avancé @@ -1391,7 +1391,7 @@ Civilization Info = Info Civilisation Relations = Relations Trade request = Échanges proposés # Requires translation! -Garrisoned by unit = +Garrisoned by unit = Unité en garnison # Victory diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 3cf516a872..22f91d30d9 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -299,10 +299,8 @@ Non-existent city = Città inesistente # Unit differences [resourceName] not required = Risorsa [resourceName] non richiesta - # Requires translation! -Lost ability (vs [originalUnit]): [ability] = - # Requires translation! -Upgrade all [count] [unit] ([cost] gold) = +Lost ability (vs [originalUnit]): [ability] = Abilità persa (vs [originalUnit]): [ability] +Upgrade all [count] [unit] ([cost] gold) = Aggiorna tutti [count] [unit] ([cost] Oro) National ability = Abilità della civiltà [firstValue] vs [secondValue] = [firstValue] vs [secondValue] Gained = Ottieni @@ -525,8 +523,7 @@ Current map: World Wrap = Mappa attuale: Mondo rotondo Overlay image = Immagine sfondo Click to choose a file = Clicca per scegliere un file Choose an image = Scegli un'immagine - # Requires translation! -Overlay opacity: = +Overlay opacity: = Capacità sfondo: Invalid overlay image = Immagine sfondo non valida World wrap is incompatible with an overlay and was deactivated. = Il Mondo rotondo è stato disattivato perché incompatibile con lo sfondo An overlay image is incompatible with world wrap and was deactivated. = L'immagine è stata disattivata perché incompatibile con il Mondo rotondo @@ -792,12 +789,9 @@ Currently playing: [title] = Traccia in riproduzione: [title] Download music = Scarica musica Downloading... = Download in corso... Could not download music! = Impossibile scaricare musica! - # Requires translation! -—Paused— = - # Requires translation! -—Default— = - # Requires translation! -—History— = +—Paused— = —In pausa— +—Default— = —Default— +—History— = —Cronologia— ## Advanced tab Advanced = Avanzate @@ -1396,8 +1390,7 @@ Allied with [civName] = Alleanza con [civName] Civilization Info = Info civiltà Relations = Rapporti Trade request = Richiesta commerciale - # Requires translation! -Garrisoned by unit = +Garrisoned by unit = Con guarnigione # Victory diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index b88d26283c..5d7badafa5 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -297,9 +297,9 @@ Non-existent city = Nie istniejące miasto [resourceName] not required = Nie wymaga: [resourceName] # Requires translation! -Lost ability (vs [originalUnit]): [ability] = +Lost ability (vs [originalUnit]): [ability] = Utracona umiejętność (w porównaniu do [originalUnit]): [ability] # Requires translation! -Upgrade all [count] [unit] ([cost] gold) = +Upgrade all [count] [unit] ([cost] gold) = Ulepsz wszystkie [count] jednostki [unit] ([cost] Złota) National ability = Zdolność narodowa [firstValue] vs [secondValue] = [firstValue] zamiast [secondValue] Gained = Uzyskano @@ -522,7 +522,7 @@ Overlay image = Obraz nakładki Click to choose a file = Kliknij żeby wybrać plik Choose an image = Wybierz obraz # Requires translation! -Overlay opacity: = +Overlay opacity: = Nieprzezroczystość nakładki: Invalid overlay image = Nieprawidłowy obraz nakładki World wrap is incompatible with an overlay and was deactivated. = Zawijanie Świata jest niezgodne z nakładką i zostało wyłączone An overlay image is incompatible with world wrap and was deactivated. = Obraz nakładki jest niezgodny z Zawijaniem Świata i został wyłączony @@ -790,11 +790,11 @@ Download music = Pobierz muzykę Downloading... = Pobieranie... Could not download music! = Nie można pobrać muzyki! # Requires translation! -—Paused— = +—Paused— = —Pauza— # Requires translation! -—Default— = +—Default— = —Domyślne— # Requires translation! -—History— = +—History— = —Historia odtwarzania— ## Advanced tab Advanced = Zaawansowane @@ -1393,7 +1393,7 @@ Civilization Info = Cywilizacje Relations = Relacje Trade request = Zapotrzebowanie na handel # Requires translation! -Garrisoned by unit = +Garrisoned by unit = Zgarnizowane przez jednostkę # Victory diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 36f5c84113..e696122e67 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" - const val appCodeNumber = 877 - const val appVersion = "4.6.19" + const val appCodeNumber = 878 + const val appVersion = "4.6.20" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 171c859cbe..dce9898a29 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,34 @@ +## 4.6.20 + +Don't kill the multiplayer updater on *pause*, instead on destroy() "exit early" + +Fixed user-invisible crash on multiplayer updating thread when resuming game + +Fixed crash when resuming EmpireOverviewScreen + +AI more willing to take happiness risk to create a new city + +AI only constructs Settler if it already has worker / improvements + +Improved AI city location picking + +Global politics table includes current civ (GOOD version) + +Revert "Global politics overview table includes current civ" + +Resolved - AI Workers remove fallout + +Global politics overview table includes current civ + +By SomeTroglodyte: +- Key bindings - unit actions, world screen and grouped UI +- Nation picker gets an Icon View, keyboard selection, and fixed sort +- Improve connected to / disconnected from Capital handling +- Make ExpanderTab "expand" properly +- UiElementDocsWriter improvement to cope with BorderedTable + +Always select military unit first, don't select great people or settl… - By WhoIsJohannes + ## 4.6.19 Modding: diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 4662cb1cf5..4f8140cc52 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -533,7 +533,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.19", 877) + val VERSION = Version("4.6.20", 878) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/878.txt b/fastlane/metadata/android/en-US/changelogs/878.txt new file mode 100644 index 0000000000..96606db1bc --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/878.txt @@ -0,0 +1,30 @@ + + +Don't kill the multiplayer updater on *pause*, instead on destroy() "exit early" + +Fixed user-invisible crash on multiplayer updating thread when resuming game + +Fixed crash when resuming EmpireOverviewScreen + +AI more willing to take happiness risk to create a new city + +AI only constructs Settler if it already has worker / improvements + +Improved AI city location picking + +Global politics table includes current civ (GOOD version) + +Revert "Global politics overview table includes current civ" + +Resolved - AI Workers remove fallout + +Global politics overview table includes current civ + +By SomeTroglodyte: +- Key bindings - unit actions, world screen and grouped UI +- Nation picker gets an Icon View, keyboard selection, and fixed sort +- Improve connected to / disconnected from Capital handling +- Make ExpanderTab "expand" properly +- UiElementDocsWriter improvement to cope with BorderedTable + +Always select military unit first, don't select great people or settl… - By WhoIsJohannes \ No newline at end of file