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

Merge branch '3.9.16-1'

Browse Source
This commit is contained in:
Yair Morgenstern
2020-07-31 10:34:42 +03:00
parent 0f727e1929 9bfc0485e1
commit 0be86a6cb2
2 changed files with 3 additions and 3 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 { object BuildConfig {
const val kotlinVersion = "1.3.71" const val kotlinVersion = "1.3.71"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 452 const val appCodeNumber = 453
const val appVersion = "3.9.16" const val appVersion = "3.9.16-patch1"
const val gdxVersion = "1.9.10" const val gdxVersion = "1.9.10"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

2
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -90,7 +90,7 @@ object UnitAutomation {
if (unit.civInfo.isBarbarian()) if (unit.civInfo.isBarbarian())
throw IllegalStateException("Barbarians is not allowed here.") throw IllegalStateException("Barbarians is not allowed here.")
if(unit.type==UnitType.Civilian) { if(unit.type.isCivilian()) {
if (unit.name == Constants.settler) if (unit.name == Constants.settler)
return SpecificUnitAutomation.automateSettlerActions(unit) return SpecificUnitAutomation.automateSettlerActions(unit)