Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version rollout #9755

Merged
merged 9 commits into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2472,8 +2472,7 @@ Transform = Transformar
Repair = Reparar
Confirm Dialog = Confirmar Diálogo
Cancel Dialog = Cancelar Diálogo
# Requires translation!
Upgrade All =
Upgrade All = Atualizar tudo

#################### Lines from Buildings from Civ V - Vanilla ####################

Expand Down
281 changes: 95 additions & 186 deletions android/assets/jsons/translations/Catalan.properties

Large diffs are not rendered by default.

304 changes: 152 additions & 152 deletions android/assets/jsons/translations/Dutch.properties

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion android/assets/jsons/translations/French.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2473,7 +2473,7 @@ Repair = Réparer
Confirm Dialog = Confirmer (boîte de dialogue)
Cancel Dialog = Annuler (boîte de dialogue)
# Requires translation!
Upgrade All =
Upgrade All = Améliorer tous

#################### Lines from Buildings from Civ V - Vanilla ####################

Expand Down
2 changes: 1 addition & 1 deletion android/assets/jsons/translations/German.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2473,7 +2473,7 @@ Repair = Reparieren
Confirm Dialog = Dialog bestätigen
Cancel Dialog = Dialog ablehnen
# Requires translation!
Upgrade All =
Upgrade All = Alle aufrüsten

#################### Lines from Buildings from Civ V - Vanilla ####################

Expand Down
9 changes: 4 additions & 5 deletions android/assets/jsons/translations/Italian.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2483,8 +2483,7 @@ Transform = Trasforma
Repair = Ripara
Confirm Dialog = Conferma dialogo
Cancel Dialog = Cancella dialogo
# Requires translation!
Upgrade All =
Upgrade All = Aggiorna tutto

#################### Lines from Buildings from Civ V - Vanilla ####################

Expand Down Expand Up @@ -3056,7 +3055,7 @@ Chartres = Chartres
Avignon = Avignon
Rouen = Rouen
Grenoble = Grenoble
Dijon = Dijon
Dijon = Digione
Amiens = Amiens
Cherbourg = Cherbourg
Poitiers = Poitiers
Expand All @@ -3067,7 +3066,7 @@ Brest = Brest
Bordeaux = Bordeaux
Rennes = Rennes
Nice = Nizza
Saint Etienne = Saint Etienne
Saint Etienne = Saint-Étienne
Nantes = Nantes
Reims = Reims
Le Mans = Le Mans
Expand All @@ -3076,7 +3075,7 @@ Limoges = Limoges
Nancy = Nancy
Lille = Lilla
Caen = Caen
Toulon = Toulon
Toulon = Tolone
Le Havre = Le Havre
Lourdes = Lourdes
Cannes = Cannes
Expand Down
14 changes: 7 additions & 7 deletions android/assets/jsons/translations/Polish.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ An unknown civilization has liberated [civ] = Nieznana cywilizacja wyzwoliła [c
# put the english word 'true' behind the '=', otherwise 'false'.
# Don't translate these words to your language, only put 'true' or 'false'. Defaults to 'true'.
# Requires translation!
EffectBeforeCause =
EffectBeforeCause = true

## Trigger effects

Expand All @@ -1032,7 +1032,7 @@ due to founding a city = wskutek założenia miasta
due to discovering a Natural Wonder = wskutek odkrycia Cudu Natury
due to our [unitName] defeating a [otherUnitName] = wskutek pokonania przez naszą jednostkę [unitName] jednostki [otherUnitName]
due to our [unitName] being defeated by a [otherUnitName] = wskutek pokonenia naszej jednostki [unitName] przez jednostkę [otherUnitName]
due to our [unitName] losing [amount] HP = wskutek uracenia przez naszą jednostkę [unitName] [amount] PŻ
due to our [unitName] losing [amount] HP = wskutek utracenia przez naszą jednostkę [unitName] [amount] PŻ
due to our [unitName] being promoted = wskutek awansu naszej jednostki [unitName]
from the ruins = z ruin

Expand Down Expand Up @@ -1723,7 +1723,7 @@ Update [modName] = Zaktualizuj [modName]
Could not download mod list = Nie można pobrać listy modów
Download mod from URL = Pobierz mod z URL
# Requires translation!
Please enter the mod repository -or- archive zip -or- branch url: =
Please enter the mod repository -or- archive zip -or- branch url: = Proszę wprowadzić repozytorium moda -lub- skompresowany plik ZIP -lub- URL gałęzi:
Invalid link! = Nieprawidłowy link!
Paste from clipboard = Wklej ze schowka
Download = Pobierz
Expand Down Expand Up @@ -2363,7 +2363,7 @@ The Spaceship = Statek Kosmiczny
Maya Long Count calendar cycle = Kalendarz Majów Długiej Rachuby
Triggerable = Inicjowane
# Requires translation!
UnitTriggerable =
UnitTriggerable = Jednostka Inicjowana
Global = Globalny
Nation = Naród
Era = Era
Expand All @@ -2385,9 +2385,9 @@ ModOptions = Ustawienia modyfikacji
Conditional = Warunkowy
TriggerCondition = Przełącz Warunki
# Requires translation!
UnitTriggerCondition =
UnitTriggerCondition = Warunek Aktywacji Jednostki
# Requires translation!
UnitActionModifier =
UnitActionModifier = Modyfikator Ruchów Jednostki


#################### Lines from spy actions #######################
Expand Down Expand Up @@ -2478,7 +2478,7 @@ Repair = Napraw
Confirm Dialog = Potwierdź okno dialogowe
Cancel Dialog = Anuluj okno dialogowe
# Requires translation!
Upgrade All =
Upgrade All = Ulepsz wszystkie

#################### Lines from Buildings from Civ V - Vanilla ####################

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2473,7 +2473,7 @@ Repair = 修理
Confirm Dialog = 确认对话框
Cancel Dialog = 取消对话框
# Requires translation!
Upgrade All =
Upgrade All = 升级全部

#################### Lines from Buildings from Civ V - Vanilla ####################

Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/BuildConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package com.unciv.build
object BuildConfig {
const val kotlinVersion = "1.8.21"
const val appName = "Unciv"
const val appCodeNumber = 888
const val appVersion = "4.7.6-patch2"
const val appCodeNumber = 889
const val appVersion = "4.7.7"

const val gdxVersion = "1.11.0"
const val ktorVersion = "2.2.3"
Expand Down
69 changes: 69 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,72 @@
## 4.7.7

Fixed tile filter for civ-related conditions for "upon ending a turn in a [tileFilter] tile" trigger

Resolved - incorrect ruleset combos for 'buy building with stat' no longer crash

Keep track of what mod each ruleset object comes from, for debug and civilopedia purposes

Fixed India's 'double unhappiness' unique

chore: Modernized WorkerAutomationTest

chore: Modernized TileImprovementConstructionTests

chore: Modernized VisibilityTest

4.7.6-patch2

Modernized UnitMovementTests to use TestGane

awesome-pages wiki modding folder reorg 5

awesome-pages wiki modding folder reorg 4 - sections as list

awesome-pages wiki modding folder reorg 3 - sections

awesome-pages wiki modding folder reorg 2

awesome-pages wiki modding folder reorg

awesome-pages test 2.1

awesome-pages test 2

Step-by-step instructions to create a new Civilization mod

4.7.6-patch1

Improved mod overview documentation

Remove awesome-pages since it's causing problems

Remove awesome-pages since it's causing problems

More modder documentation clarity

Reorg modding pages

mkdocs awesome-pages plugin

Deleted site files from master branch - they're only used in gh-pages branch anyway

Reorganize modders documentation files

By SeventhM:
- Fix buildings/units not triggering and golden age stat updates
- Avoid crashes with incorrect condtionals
- Scaling purchase costs for faith/culture/science/etc. with speed
- Better support for lacking a capital

By SomeTroglodyte:
- Minimal support for Alpha Frontier-like Workers
- Explain the invoke trick as well
- Clearer NotificationActions code
- Prevent activation of disabled actors via key shortcuts
- Keyboard bindings for Main Menu Screen

Fix civilopedia gold cost - By Skekdog

## 4.7.6

"Requires a [buildingFilter] in at least [amount] cities" works correctly with filters that aren't building names
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/UncivGame.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.6-patch2", 888)
val VERSION = Version("4.7.7", 889)
//endregion

lateinit var Current: UncivGame
Expand Down
68 changes: 68 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/889.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@


Fixed tile filter for civ-related conditions for "upon ending a turn in a [tileFilter] tile" trigger

Resolved - incorrect ruleset combos for 'buy building with stat' no longer crash

Keep track of what mod each ruleset object comes from, for debug and civilopedia purposes

Fixed India's 'double unhappiness' unique

chore: Modernized WorkerAutomationTest

chore: Modernized TileImprovementConstructionTests

chore: Modernized VisibilityTest

4.7.6-patch2

Modernized UnitMovementTests to use TestGane

awesome-pages wiki modding folder reorg 5

awesome-pages wiki modding folder reorg 4 - sections as list

awesome-pages wiki modding folder reorg 3 - sections

awesome-pages wiki modding folder reorg 2

awesome-pages wiki modding folder reorg

awesome-pages test 2.1

awesome-pages test 2

Step-by-step instructions to create a new Civilization mod

4.7.6-patch1

Improved mod overview documentation

Remove awesome-pages since it's causing problems

Remove awesome-pages since it's causing problems

More modder documentation clarity

Reorg modding pages

mkdocs awesome-pages plugin

Deleted site files from master branch - they're only used in gh-pages branch anyway

Reorganize modders documentation files

By SeventhM:
- Fix buildings/units not triggering and golden age stat updates
- Avoid crashes with incorrect condtionals
- Scaling purchase costs for faith/culture/science/etc. with speed
- Better support for lacking a capital

By SomeTroglodyte:
- Minimal support for Alpha Frontier-like Workers
- Explain the invoke trick as well
- Clearer NotificationActions code
- Prevent activation of disabled actors via key shortcuts
- Keyboard bindings for Main Menu Screen

Fix civilopedia gold cost - By Skekdog