diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index a4a7b0bbec..2c3ca5c99d 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -8589,7 +8589,7 @@ Italian:"Sentinella" German:"Wache" French:"Sentinel" - Rusian:"Караул" + Russian:"Караул" Simplified_Chinese:"警戒能力" } "Range":{ @@ -8717,21 +8717,21 @@ Italian:"Incursione costiera I" German:"Küstenräuber I" French:"Commando Côtier I" //not very accurate - Russain:"Береговой налетчик I" + Russian:"Береговой налетчик I" Simplified_Chinese:"海掠一级" } "Coastal Raider II":{ Italian:"Incursione costiera II" German:"Küstenräuber II" French:"Commando Côtier II" - Russain:"Береговой налетчик II" + Russian:"Береговой налетчик II" Simplified_Chinese:"海掠二级" } "Coastal Raider III":{ Italian:"Incursione costiera III" German:"Küstenräuber III" French:"Commando Côtier III" - Russain:"Береговой налетчик III" + Russian:"Береговой налетчик III" Simplified_Chinese:"海掠三级" } "Targeting I":{ diff --git a/android/build.gradle b/android/build.gradle index 4a68921bdc..e018d07bff 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 231 - versionName "2.15.0" + versionCode 232 + versionName "2.15.0-patch1" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 01de2b688a..074f8b86a5 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -92,6 +92,7 @@ class CityInfo { toReturn.isBeingRazed=isBeingRazed toReturn.isConnectedToCapital = isConnectedToCapital toReturn.attackedThisTurn = attackedThisTurn + toReturn.resistanceCounter = resistanceCounter return toReturn }