mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-09 23:39:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

4.6.1-patch1

Browse Source
This commit is contained in:
Yair Morgenstern
2023-04-13 23:21:42 +03:00
parent 5232984bd9
commit fd9284f8a3
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -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"

2
core/src/com/unciv/UncivGame.kt
View File

@ -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

16
core/src/com/unciv/ui/screens/worldscreen/unit/UnitTable.kt
View File

@ -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