From 52f288be05be824489ee7dddb60bfc527ca9fca7 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 9 Apr 2023 18:07:03 +0300 Subject: [PATCH] Version rollout (#9149) * Bump version and create initial changelog entry * Update Simplified_Chinese.properties (#9145) * Update Italian.properties (#9143) * Update Spanish.properties (#9142) --------- Co-authored-by: yairm210 Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com> --- .../jsons/translations/Italian.properties | 3 +-- .../Simplified_Chinese.properties | 10 ++++----- .../jsons/translations/Spanish.properties | 2 +- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 22 +++++++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/845.txt | 21 ++++++++++++++++++ 7 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/845.txt diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 3267691332..22dd72f981 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -382,8 +382,7 @@ Sparse = Sparse Abundant = Abbondanti Strategic Balance = Equilibrio strategico Legendary Start = Partenza leggendaria - # Requires translation! -This is used for painting resources, not in map generator steps: = +This is used for painting resources, not in map generator steps: = Questo va usato per dipingere risorse, non durante i generatori di mappe: Advanced Settings = Impostazioni avanzate RNG Seed = Seme RNG diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index c04bcb0683..82594bf961 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -6335,7 +6335,7 @@ For technical reasons, only direct keys or Ctrl-Letter combinations can be used. The Escape key is intentionally excluded from being reassigned. = 不可重定义Esc键 Currently, there are no checks to prevent conflicting assignments. = 目前，系统无法侦测快捷键间冲突 # Requires translation! -Using the Keys page = +Using the Keys page = 使用密钥页面 Each binding has a button with an image looking like this: = 每一个绑定都有一个像这样的图标： While hovering the mouse over the key button, you can press a desired key directly to assign it. = 移动鼠标至功能键上，然后按下键盘按键即可定义快捷键。 Double-click the image to reset the binding to default. = 双击图标重制。 @@ -6348,15 +6348,15 @@ How to find information = 如何检索信息 Select categories with the buttons on top of the screen. Also up there is the button to leave Civilopedia and go back to where you were before. = 于屏幕上方选择对应分类，另外，屏幕上方还有回退键 Each category has a list of entries on the left of the screen, sorted alphabetically (with few exceptions). Clicking an entry will update the center pane were you are currently reading this. = 每个分类都含有一列排好的条目，点击条目即可阅读。 # Requires translation! -Lines can link to other Civilopedia entries, they are marked with a chain link symbol like this one. You can click anywhere on the line to follow the link. = +Lines can link to other Civilopedia entries, they are marked with a chain link symbol like this one. You can click anywhere on the line to follow the link. = 线可以链接到其他Civilopedia条目，它们被标记为像这样的链接符号。您可以单击该行上的任何位置来跟踪该链接。 # Requires translation! -The current category is special - all articles on general concepts are here. It is called 'Tutorials' because you can revisit these here, too. = +The current category is special - all articles on general concepts are here. It is called 'Tutorials' because you can revisit these here, too. = 当前类别是特殊的-所有关于一般概念的文章都在这里。它被称为“教程”，因为你也可以在这里重温这些内容。 What information can I find = 我可以检索到什么样的信息 The data shown is not dependent on your current game's situation, e.g. bonuses for the nation you are playing or difficulty modifiers will not affect the numbers. = 这里的数据并不等同于你游戏状态的数据，因为有些民族或有些模组数据会不同。 # Requires translation! -However, it will reflect the mods you are playing! The combination of base ruleset and extension mods you select define the rules of a game, what objects exist and how they interact, and the Civilopedia mirrors these rules. = +However, it will reflect the mods you are playing! The combination of base ruleset and extension mods you select define the rules of a game, what objects exist and how they interact, and the Civilopedia mirrors these rules. = 然而，它将反映你正在玩的mod !你选择的基本规则集和扩展mod的组合定义了游戏规则，存在什么对象以及它们如何交互，而Civilopedia反映了这些规则 If you opened the Civilopedia from the main menu, the "Ruleset" will be that of the last game you started. = 如果从主页打开文明维基，规则级会显示为你上一个游戏选择的。 # Requires translation! -Letters can select categories, and when there are multiple categories matching the same letter, you can press that repeatedly to cycle between these. = +Letters can select categories, and when there are multiple categories matching the same letter, you can press that repeatedly to cycle between these. = 字母可以选择类别，当有多个类别匹配同一个字母时，您可以重复按下该按钮，在这些类别之间循环。 The arrow keys allow navigation as well - left/right for categories, up/down for entries. = 方向键也可以用来在文明维基导航，左右切换分类，上下切换条目。 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index bb56b8c69d..030ab9d3d6 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -380,7 +380,7 @@ Abundant = Abundantes Strategic Balance = Balance Estratégico Legendary Start = Inicio Legendario # Requires translation! -This is used for painting resources, not in map generator steps: = +This is used for painting resources, not in map generator steps: = Esto es usado para pintar recursos, no en los pasos del generador: Advanced Settings = Ajustes Avanzados RNG Seed = Semilla diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 1b9340f77d..d82794e0e7 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 = 844 - const val appVersion = "4.5.17-patch1" + const val appCodeNumber = 845 + const val appVersion = "4.5.18" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index a4010d8db3..8710dc886d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,25 @@ +## 4.5.18 + +4.5.17-patch1 + +Resolved - crash screen ' + +toString extension including sign (+/-) + +Actually implemented nation filter conditional + +Better wrapping for long construction item names + +"" conditional added + +By SomeTroglodyte: +- User option to control NotificationScroll behaviour +- Code Reorg AlertPopup + +Attempt to re-add screenshots to help new Android Studio setups. Check if rendering properly - By itanasi + +Updated Building-Locally.md - By vermontbail + ## 4.5.17 Battle table bonuses according to tile to attack from diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 3bb1247d74..3716ef9319 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.5.17-patch1", 844) + val VERSION = Version("4.5.18", 845) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/845.txt b/fastlane/metadata/android/en-US/changelogs/845.txt new file mode 100644 index 0000000000..4d08a84db2 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/845.txt @@ -0,0 +1,21 @@ + + +4.5.17-patch1 + +Resolved - crash screen ' + +toString extension including sign (+/-) + +Actually implemented nation filter conditional + +Better wrapping for long construction item names + +"" conditional added + +By SomeTroglodyte: +- User option to control NotificationScroll behaviour +- Code Reorg AlertPopup + +Attempt to re-add screenshots to help new Android Studio setups. Check if rendering properly - By itanasi + +Updated Building-Locally.md - By vermontbail \ No newline at end of file