From fd9284f8a372d648fa648e71ad143c0bcbef42a3 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 13 Apr 2023 23:21:42 +0300 Subject: [PATCH] 4.6.1-patch1 --- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- core/src/com/unciv/UncivGame.kt | 2 +- .../ui/screens/worldscreen/unit/UnitTable.kt | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index e65dba634a..430e1f906b 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 = 846 - const val appVersion = "4.6.1" + const val appCodeNumber = 847 + const val appVersion = "4.6.1-patch1" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 0ac628ed1e..05f145c9a3 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.1", 846) + val VERSION = Version("4.6.1-patch1", 847) //endregion lateinit var Current: UncivGame diff --git a/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt index 7e42c30331..1476698bd7 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt @@ -14,19 +14,19 @@ import com.unciv.logic.map.mapunit.MapUnit import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr -import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories -import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen -import com.unciv.ui.images.ImageGetter -import com.unciv.ui.screens.pickerscreens.CityRenamePopup -import com.unciv.ui.screens.pickerscreens.PromotionPickerScreen -import com.unciv.ui.screens.pickerscreens.UnitRenamePopup -import com.unciv.ui.screens.basescreen.BaseScreen import com.unciv.ui.components.UnitGroup import com.unciv.ui.components.extensions.addSeparator import com.unciv.ui.components.extensions.center import com.unciv.ui.components.extensions.darken import com.unciv.ui.components.extensions.onClick import com.unciv.ui.components.extensions.toLabel +import com.unciv.ui.images.ImageGetter +import com.unciv.ui.screens.basescreen.BaseScreen +import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories +import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen +import com.unciv.ui.screens.pickerscreens.CityRenamePopup +import com.unciv.ui.screens.pickerscreens.PromotionPickerScreen +import com.unciv.ui.screens.pickerscreens.UnitRenamePopup import com.unciv.ui.screens.worldscreen.WorldScreen class UnitTable(val worldScreen: WorldScreen) : Table() { @@ -292,7 +292,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table() { } private fun buildNameLabelText(unit: MapUnit) : String { - var nameLabelText = unit.displayName().tr() + var nameLabelText = unit.displayName().tr(true) if (unit.health < 100) nameLabelText += " (" + unit.health + ")" return nameLabelText