From 5c1ca900b79f90f1299ee28d4bb9e5e441377d7a Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 11 Jul 2022 10:35:56 +0300 Subject: [PATCH] Version rollout (#7422) * Bump version and create initial changelog entry * Update Simplified_Chinese.properties (#7415) * Update Traditional_Chinese.properties (#7413) * Update French.properties (#7406) * Update French.properties * Update French.properties Revert bad (idea) changes * Update German translation (#7405) * Update Spanish.properties (#7401) Co-authored-by: yairm210 Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com> Co-authored-by: Chia-Hung Ni Co-authored-by: Ouaz Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com> Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com> --- .../jsons/translations/French.properties | 4 +-- .../jsons/translations/German.properties | 8 ++--- .../Simplified_Chinese.properties | 2 +- .../jsons/translations/Spanish.properties | 4 +-- .../Traditional_Chinese.properties | 33 +++++++------------ buildSrc/src/main/kotlin/BuildConfig.kt | 4 +-- changelog.md | 21 ++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/737.txt | 20 +++++++++++ 9 files changed, 63 insertions(+), 35 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/737.txt diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index b996a8173e..1f1ac71893 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1180,7 +1180,7 @@ WLTK demand = Demande FDR WLTK- = FDR- Number of your cities\ndemanding this resource for\n'We Love The King Day' = Nombre de vos villes\ndemandant cette ressource pour\nla 'Fête du Roi' # Requires translation! -Trade request = +Trade request = Échanges proposés # Victory @@ -1428,7 +1428,7 @@ Dogfighting III = Combat aérien III Choose name for [unitName] = Choisir le nom pour [unitName] [unitFilter] units gain the [promotion] promotion = Les unités [unitFilter] gagnent la promotion [promotion] # Requires translation! -Requires = +Requires = Nécessite # Multiplayer Turn Checker Service diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 5f8227dd82..4ab3e31aab 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -693,7 +693,7 @@ Show pixel units = Pixel-Einheiten anzeigen Show pixel improvements = Pixel-Verbesserungen anzeigen Enable Nuclear Weapons = Aktiviere Atomwaffen Experimental Demographics scoreboard = Experimentelle Demographie-Übersicht -Unit icon opacity = Deckkfraft des Einheitensymbols +Unit icon opacity = Deckkraft des Einheitensymbols Show zoom buttons in world screen = Zoom-Tasten in der Weltansicht anzeigen Enable display cutout (requires restart) = Aktiviere Bildschirmausschnitt (Neustart erforderlich) Show tile yields = Felderträge anzeigen @@ -1179,8 +1179,7 @@ Number of your cities celebrating\n'We Love The King Day' thanks\nto access to t WLTK demand = Bedarf für WLDK-Tag WLTK- = WLDK- Number of your cities\ndemanding this resource for\n'We Love The King Day' = Anzahl Deiner Städte, die nach\ndieser Ressource verlangen, um\nden 'Wir lieben den König'-Tag\nfeiern zu können. - # Requires translation! -Trade request = +Trade request = Handelsanfrage # Victory @@ -1427,8 +1426,7 @@ Dogfighting II = Kurvenkampf II Dogfighting III = Kurvenkampf III Choose name for [unitName] = Wähle Namen für [unitName] [unitFilter] units gain the [promotion] promotion = [unitFilter] Einheiten erhalten die [promotion] Beförderung - # Requires translation! -Requires = +Requires = Benötigt # Multiplayer Turn Checker Service diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 60d31e8715..aa4256ec07 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -1785,7 +1785,7 @@ Provides 1 extra copy of each improved luxury resource near this City = 所在 Mint = 铸币厂 Aqueduct = 引水渠 -[relativeAmount]% Food is carried over after population increases [cityFilter] = [cityFilter]在人口增长后人口增长作序食物减少[relativeAmount]% +[relativeAmount]% Food is carried over after population increases [cityFilter] = [cityFilter]在人口增长后人口增长所需食物减少[relativeAmount]% Heroic Epic = 英雄史诗 All newly-trained [baseUnitFilter] units [cityFilter] receive the [promotion] promotion = [cityFilter]新组建的[baseUnitFilter]单位获得[promotion]晋升 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 4d71300c24..6f7ba12911 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -1180,7 +1180,7 @@ WLTK demand = Demanda para DAaR WLTK- = DAaR- Number of your cities\ndemanding this resource for\n'We Love The King Day' = Número de ciudades\ndemandando este recurso para el\n"Día de Adoración al Rey" # Requires translation! -Trade request = +Trade request = Propuesta de Comercio # Victory @@ -1428,7 +1428,7 @@ Dogfighting III = Combate aéreo III Choose name for [unitName] = Dar nombre a [unitName] [unitFilter] units gain the [promotion] promotion = unidades [unitFilter] ganan el ascenso [promotion] # Requires translation! -Requires = +Requires = Requiere # Multiplayer Turn Checker Service diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 441e1a8109..d84a34be28 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -5303,28 +5303,17 @@ Enköping = 梅勒呂德 Skövde = 舍夫德市 Eskilstuna = 埃斯通納 Luleå = 呂勒奧市 - # Requires translation! -Lidköping = - # Requires translation! -Södertälje = - # Requires translation! -Mariestad = - # Requires translation! -Östersund = - # Requires translation! -Borås = - # Requires translation! -Sundsvall = - # Requires translation! -Vimmerby = - # Requires translation! -Köping = - # Requires translation! -Mora = - # Requires translation! -Arboga = - # Requires translation! -Växjö = +Lidköping = 利德雪平 +Södertälje = 南泰利耶 +Mariestad = 瑪麗斯塔德 +Östersund = 厄斯特松德 +Borås = 布羅斯 +Sundsvall = 松茲瓦爾 +Vimmerby = 維默比 +Köping = 雪平市 +Mora = 穆拉 +Arboga = 阿爾博加 +Växjö = 韋克舍 # Requires translation! Gränna = # Requires translation! diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 9ebe023668..b4ca57db14 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.7.0" const val appName = "Unciv" - const val appCodeNumber = 736 - const val appVersion = "4.1.17-patch1" + const val appCodeNumber = 737 + const val appVersion = "4.1.18" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index a62b4d343f..9605de2d05 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,24 @@ +## 4.1.18 + +Fix multiple capture uniques resulting in double-capture + +4.1.17-patch1 + +Hopefully resolved ANRs caused by available fonts taking too long to load + +Refactorings & three more unit tests for uniques - By xlenstra + +By OptimizedForDensity: +- Fix monastery purchase cost +- Fix any civ being able to capture barbarians +- Stop automate production setting from automating other players' production in MP +- Fix policy uniques not being applied +- Sort game speeds in Civilopedia by game speed modifier + +Remove double XP gain from Intercept - By itanasi + +Fix Desktop multiplayer options showing a double separator - By Azzurite + ## 4.1.17 Puppet cities generate no extra unhappiness (per Civ V) diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 6cc7310449..7b1b866ea9 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -451,7 +451,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.1.17", 735) + val VERSION = Version("4.1.18", 737) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/737.txt b/fastlane/metadata/android/en-US/changelogs/737.txt new file mode 100644 index 0000000000..e86ff093d4 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/737.txt @@ -0,0 +1,20 @@ + + +Fix multiple capture uniques resulting in double-capture + +4.1.17-patch1 + +Hopefully resolved ANRs caused by available fonts taking too long to load + +Refactorings & three more unit tests for uniques - By xlenstra + +By OptimizedForDensity: +- Fix monastery purchase cost +- Fix any civ being able to capture barbarians +- Stop automate production setting from automating other players' production in MP +- Fix policy uniques not being applied +- Sort game speeds in Civilopedia by game speed modifier + +Remove double XP gain from Intercept - By itanasi + +Fix Desktop multiplayer options showing a double separator - By Azzurite \ No newline at end of file