mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-01 02:14:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'temp'

Browse Source
This commit is contained in:
Yair Morgenstern 2021-05-20 00:54:39 +03:00
commit 11c8a67596
3 changed files with 4 additions and 4 deletions
Show Stats 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.4.30"
const val appName = "Unciv"
const val appCodeNumber = 567
const val appVersion = "3.14.9"
const val appCodeNumber = 568
const val appVersion = "3.14.9-patch1"
const val gdxVersion = "1.10.0"
const val roboVMVersion = "2.3.1"

2
core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
View File

@ -17,8 +17,8 @@ import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.models.stats.Stat
import com.unciv.models.translations.tr
import com.unciv.ui.utils.*
import java.lang.Float.min
import kotlin.concurrent.thread
import kotlin.math.min
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScreen.skin) {

2
core/src/com/unciv/ui/pickerscreens/TechButton.kt
View File

@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align
import com.unciv.logic.civilization.TechManager
import com.unciv.ui.utils.*
import java.lang.Float.min
import kotlin.math.min
class TechButton(techName:String, private val techManager: TechManager, isWorldScreen: Boolean = true) : Table(CameraStageBaseScreen.skin) {
val text = "".toLabel().apply { setAlignment(Align.center) }