diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 1300898278..cc02b34ba0 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -748,8 +748,7 @@ Reset = Opnieuw instellen Show zoom buttons in world screen = Toon zoomknoppen in het wereldscherm Experimental Demographics scoreboard = Experimenteel Demografisch scorebord - # Requires translation! -Size of Unitset art in Civilopedia = +Size of Unitset art in Civilopedia = Grootte Eenheidsstijl kunstwerken in Civilopedia. ### Visual Hints subgroup @@ -932,14 +931,10 @@ Your city [cityName] can bombard the enemy! = Jouw stad [cityName] kan de vijand [amount] of your cities can bombard the enemy! = [amount] van jouw steden kunnen de vijand bombarderen [amount] enemy units were spotted near our territory = [amount] vijandelijke eenheden werden gezien in de buurt van ons territorium [amount] enemy units were spotted in our territory = [amount] vijandelijke eenheden werden gespot op ons grondgebied - # Requires translation! -A(n) [nukeType] from [civName] has exploded in our territory! = - # Requires translation! -A(n) [nukeType] has been detonated by [civName]! = - # Requires translation! -A(n) [nukeType] has been detonated by an unkown civilization! = - # Requires translation! -After an attempted attack by our [nukeType], [civName] has declared war on us! = +A(n) [nukeType] from [civName] has exploded in our territory! = Een [nukeType] van [civName] is geëxplodeerd in ons territorium! +A(n) [nukeType] has been detonated by [civName]! = Een [nukeType] is afgevuurd door [civName]! +A(n) [nukeType] has been detonated by an unkown civilization! = Een [nukeType] is afgevuurd door een onbekende beschaving! +After an attempted attack by our [nukeType], [civName] has declared war on us! = Na een gepoogde aanval met onze [nukeType], heeft [civName] de oorlog aan ons verklaard! After being hit by our [nukeType], [civName] has declared war on us! = Na getroffen te zijn door onze [nukeType], heeft [civName] ons de oorlog verklaard! The civilization of [civName] has been destroyed! = De [civName] beschaving is vernietigt! The City-State of [name] has been destroyed! = De stadstaat van [name] is vernietigd! @@ -2048,10 +2043,8 @@ Automatically built in all cities where it is buildable = Wordt automatisch gebo Creates a [improvementName] improvement on a specific tile = Plaatst een [improvementName] verbetering op een specifieke tegel Founds a new city = Sticht een nieuwe stad Can instantly construct a [improvementFilter] improvement = Kan onmiddelijk een [improvementFilter] verbetering bouwen - # Requires translation! -Can Spread Religion = - # Requires translation! -Can remove other religions from cities = +Can Spread Religion = Kan Religie Verspreiden +Can remove other religions from cities = Kan andere religies uit steden verwijderen May found a religion = Kan een religie stichten May enhance a religion = Kan een religie uitbreiden Can build [improvementFilter/terrainFilter] improvements on tiles = Kan [improvementFilter/terrainFilter] verbeteringen bouwen op tegels @@ -2435,8 +2428,7 @@ Policy = Policy FounderBelief = FounderBelief FollowerBelief = FollowerBelief Building = Building - # Requires translation! -UnitAction = +UnitAction = UnitAction Unit = Unit UnitType = UnitType Promotion = Promotion @@ -6218,9 +6210,9 @@ Polder = Polder Citrus = Citrus -Copper = Koperen +Copper = Koper -Crab = Krabben +Crab = Krab Salt = Zout @@ -6230,8 +6222,7 @@ Truffles = Truffels #################### Lines from UnitPromotions from Civ V - Gods & Kings #################### - # Requires translation! -Devout = +Devout = Godsdienstig Hussar = Huzaar diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index c4d849424e..23726febb5 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -748,8 +748,7 @@ Reset = Zurücksetzen Show zoom buttons in world screen = Zoom-Tasten in der Weltansicht anzeigen Experimental Demographics scoreboard = Experimentelle Demographien-Übersicht - # Requires translation! -Size of Unitset art in Civilopedia = +Size of Unitset art in Civilopedia = Größe der Einheitengrafik in der Zivilopädie ### Visual Hints subgroup @@ -2044,10 +2043,8 @@ Automatically built in all cities where it is buildable = Automatisch gebaut in Creates a [improvementName] improvement on a specific tile = Erschafft eine [improvementName] Verbesserung auf einem bestimmten Feld Founds a new city = Gründet eine neue Stadt Can instantly construct a [improvementFilter] improvement = Kann sofort eine [improvementFilter] Verbesserung bauen - # Requires translation! -Can Spread Religion = - # Requires translation! -Can remove other religions from cities = +Can Spread Religion = Kann Religion verbreiten +Can remove other religions from cities = Kann andere Religionen von Städten entfernen May found a religion = Darf eine Religion gründen May enhance a religion = Kann eine Religion verbessern Can build [improvementFilter/terrainFilter] improvements on tiles = Kann [improvementFilter/terrainFilter] Verbesserungen auf Feldern bauen @@ -2431,8 +2428,7 @@ Policy = Politik FounderBelief = Gründerglaube FollowerBelief = Anhängerglaube Building = Gebäude - # Requires translation! -UnitAction = +UnitAction = Einheitenaktion Unit = Einheit UnitType = Einheitentyp Promotion = Beförderung @@ -6226,8 +6222,7 @@ Truffles = Trüffel #################### Lines from UnitPromotions from Civ V - Gods & Kings #################### - # Requires translation! -Devout = +Devout = Frömmigkeit Hussar = Hussar diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 0ac707d35f..4ed210b34f 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -749,7 +749,7 @@ Show zoom buttons in world screen = Mostrar Botones para Zoom del Mapa Experimental Demographics scoreboard = Tabla de Puntaje Demográfica # Requires translation! -Size of Unitset art in Civilopedia = +Size of Unitset art in Civilopedia = Tamaño de las Unidades en la Civilopedia ### Visual Hints subgroup @@ -2045,9 +2045,9 @@ Creates a [improvementName] improvement on a specific tile = Crea una mejora de Founds a new city = Funda una nueva ciudad Can instantly construct a [improvementFilter] improvement = Puede construír una mejora de [improvementFilter] de inmediato # Requires translation! -Can Spread Religion = +Can Spread Religion = Puede difundir una Religión # Requires translation! -Can remove other religions from cities = +Can remove other religions from cities = Puede remover otras religiones de las ciudades May found a religion = Puede fundar una religión May enhance a religion = Puede realzar una religión Can build [improvementFilter/terrainFilter] improvements on tiles = Puede eregir: [improvementFilter/terrainFilter] @@ -2432,7 +2432,7 @@ FounderBelief = Creencia del fundador FollowerBelief = Creencia del seguidor Building = Edificio # Requires translation! -UnitAction = +UnitAction = AccióndUnidad Unit = Unidad UnitType = Tipo de unidad Promotion = Promoción @@ -6227,7 +6227,7 @@ Truffles = Trufas # Requires translation! -Devout = +Devout = Devoto Hussar = Husar diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 37a9a9955c..a76046eb14 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" - const val appCodeNumber = 921 - const val appVersion = "4.8.11" + const val appCodeNumber = 922 + const val appVersion = "4.8.12" const val gdxVersion = "1.11.0" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index 84bcefed9c..03ecfb1d92 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,16 @@ +## 4.8.12 + +Separate unit automation from other actions + +chore: Separated 'declare war' logic from DiplomacyManager + +AI now uses free tech points - By tuvus + +By SomeTroglodyte: +- Align ruleset icons in text to font metrics +- Tweak FasterUIDevelopment to offer normal Scene2D debugging, and some linting +- Pure package reorg: Widgets + ## 4.8.11 Religion fixes: diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 432fbf76ce..6786c5adf5 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -536,7 +536,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.8.11", 921) + val VERSION = Version("4.8.12", 922) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/922.txt b/fastlane/metadata/android/en-US/changelogs/922.txt new file mode 100644 index 0000000000..ecffb69d06 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/922.txt @@ -0,0 +1,12 @@ + + +Separate unit automation from other actions + +chore: Separated 'declare war' logic from DiplomacyManager + +AI now uses free tech points - By tuvus + +By SomeTroglodyte: +- Align ruleset icons in text to font metrics +- Tweak FasterUIDevelopment to offer normal Scene2D debugging, and some linting +- Pure package reorg: Widgets \ No newline at end of file