Commit Graph

3971 Commits

Author SHA1 Message Date
b94321f535 4.6.14 2023-05-23 20:37:51 +03:00
5857301732 Version rollout (#9440)
* Bump version and create initial changelog entry

* Update German translation (#9437)

* Update Spanish.properties (#9434)

* Update Brazilian_Portuguese.properties (#9433)

* Update French.properties (#9426)

* Update Italian.properties (#9422)

* Update Japanese.properties (#9346)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

*Add translations
*Add city names

* Update Japanese.properties

*Add new translations
*Fixed some translations regarding tile improvements that I have translated previously

* Update Japanese.properties

*Add translation for City-Nations messages, ruin-regarding messages, and more.

* Update Japanese.properties

Add translations for 
*Sweden, Austria, and some city-states
*Multiplayer Game notifications
*Tile Improvements
*Civilopedia explanations

* Update Japanese.properties

Add translations for
*Religion beliefs
*Civilopedia descriptions
*Victory status
*and more

* Update Japanese.properties

* Edit details

* Update Japanese.properties

*add new branches

* Update Japanese.properties

Fix wrong placeholders

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: namazulake <130637228+namazulake@users.noreply.github.com>
2023-05-23 20:33:10 +03:00
95ffbd6a6e 4.6.13 2023-05-21 14:16:50 +03:00
9c2a9975a6 Version rollout (#9418)
* Bump version and create initial changelog entry

* Update Greek.properties (#9407)

* Update Spanish.properties (#9397)

* Update Indonesian.properties (#9393)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: marek06072 <133993044+marek06072@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
2023-05-21 14:08:49 +03:00
54f651c2fb fix: fixed translation text (#9404)
* fix: fixed translation text

* fix: fixed Romanian.properties
2023-05-18 18:30:17 +03:00
91116f8df3 Fixed more warnings (#9401)
* fix: fix FunctionParameterNaming warnings

* fix: fix InvalidPackageDeclaration warnings

* fix: fix MatchingDeclarationName warnings

* fix: fix WrongEqualsTypeParameter warnings

* fix: fix UnusedPrivateProperty warnings

* fix: fix UseCheckOrError warningsU

* fix: fix UseRequire warningsU

* detekt: disabled SpreadOperator rule

* fix: resolve MemberNameEqualsClassName rule

* detekt: disabled ForbiddenComment rule

* fix: resolved SwallowedException warning

* fix: resolved ThrowingExceptionsWithoutMessageOrCause warning

* fix: resolved EmptyFunctionBlock warning

* fix: resolved EmptyFunctionBlock warning

* fix: resolved InstanceOfCheckForError warning

* detekt: disable TooGenericExceptionCaught warning

* detekt: disable TooGenericExceptionThrown warning

* fix: resolve part of NestedBlockDepth warnings
2023-05-18 10:12:33 +03:00
4a7f65f281 4.6.12 2023-05-14 22:03:40 +03:00
3879f18288 Version rollout (#9388)
* Bump version and create initial changelog entry

* Update Italian.properties (#9381)

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#9378)

* Update Polish.properties (#9377)

* Updated Brazilian_Portuguese.properties (#9376)

* Update German translation (#9373)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
2023-05-14 21:55:54 +03:00
841a1aa564 ci: improved detekt configuration and ci (#9380)
* ci: improved detekt configuration

it still needs some work but it's getting there

* detekt: separated errors from warnings

Detekt doesn't currently have a mechanism for failing only on specific issues

workaround suggested by the maintainer of Detekt

* rebased on master

* fix: resolve ExplicitItLambdaParameter

* fix: fix last star import
2023-05-14 21:55:36 +03:00
48bd416347 Multi-server preparations: Save server info in game, save server functionality in specific class (#9379)
* Save server info in game

* Moved server functionality into server class

* Fix Android multiplayer update
2023-05-13 21:51:44 +03:00
97769b89b6 Combat java.util.star-import (#9382) 2023-05-13 21:50:55 +03:00
9a0ba7dcd8 4.6.11 2023-05-11 13:53:12 +03:00
3f2dd3614f Version rollout (#9372)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#9371)

* Update Brazilian_Portuguese.properties (#9352)

* Update Russian.properties (#9351)

There was a letter missing in the word

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: iliademid21 <132929464+iliademid21@users.noreply.github.com>
2023-05-11 13:50:21 +03:00
f3e80a4021 Fixed a couple warnings reported by code analysis (#9364)
* fix: resolve EmptyCatchBlock warnings

* fix: resolve PrintStackTrace warnings

* fix: resolve SwallowedException warnings

* fix: resolve ThrowingExceptionsWithoutMessageOrCause warnings

* fix: resolve ConstructorParameterNaming warnings

* fix: resolve FunctionParameterNaming warnings

* fix: resolve InvalidPackageDeclaration warnings

* fix: resolve ForEachOnRange warnings

* fix: resolve ImplicitDefaultLocale warnings

* fix: resolve MayBeConst warnings

* fix: resolve NewLineAtEndOfFile warnings

* fix: resolve UnusedParameter warnings

* fix: resolve UtilityClassWithPublicConstructor warnings

* fix: resolve WildcardImport warnings
2023-05-10 11:43:53 +03:00
a3ef6fa314 Add May not annex cities unique (#9314)
* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.

* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.

* Fix raze button being unavailable in city screen

* Fixed raze button being available in city screen, as per civ5

* Corrected indentation

* mayAnnex instead of canAnnex, hasUnique rather than getMatchingUniques

* AI will follow rules

* Replaced getMatchingUniques with hasUnique, for real this time
2023-05-09 23:02:19 +03:00
d00b06bad4 4.6.10 2023-05-08 18:57:30 +03:00
ed2c294c6f Version rollout (#9350)
* Bump version and create initial changelog entry

* Update Italian.properties (#9347)

* Update Italian.properties

* Update Italian.properties

* Update German translation (#9345)

* Update German translation

* Update German translation

* Update Spanish.properties (#9344)

* update Simplified_Chinese (#9339)

* Update French.properties (#9336)

* Update French.properties

* Update French.properties

Better translation for the Kremlin quote.

* Update Polish.properties (#9335)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-05-08 18:45:27 +03:00
e0505d1eb7 Songhai Civilian units no longer gain Amphibious promotion 2023-05-08 18:06:01 +03:00
cf4419912d 4.6.9 2023-05-06 21:25:13 +03:00
52e8623f08 AbsoluteUnits - Hussar, Cossack, Panzer (#9331) 2023-05-06 21:13:33 +03:00
a370117301 Resolved #9036 - New Kremlin quote 2023-05-04 10:47:00 +03:00
044b67d709 4.6.8 2023-05-03 00:11:43 +03:00
0252416e23 Version rollout (#9313)
* Bump version and create initial changelog entry

* Update Ukrainian.properties (#9311)

* Update Polish.properties (#9309)

* Update Indonesian.properties (#9307)

Improve some translations

* Update French.properties (#9303)

* Update Catalan.properties (#9299)

* Update German.properties (#9297)

Fixed mistakes from the last pull request and made a few corrections.

Co-authored-by: Birk Birkner <birkner@bbirkner.de>

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
2023-05-03 00:06:53 +03:00
fd67a3520e AbsoluteUnits - Norwegian Ski Infantry, Mehal Sefari, Carolean, Foreign Legion (#9305) 2023-05-02 00:25:07 +03:00
e9fca65b3d 4.6.7 2023-04-26 22:29:09 +03:00
271e88ad03 Version rollout (#9292)
* Bump version and create initial changelog entry

* update Simplified_Chinese translation (#9289)

Co-authored-by: chr_56 <_>

* update Japanese.properties (#9286)

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#9285)

* Update Indonesian.properties (#9283)

* Update Brazilian_Portuguese.properties (#9277)

* Update Polish.properties (#9276)

* Update French.properties (#9274)

Small translation improvements:
- Remove a few past tenses which are unnecessary in French (in the context, past participle alone is enough, especially in notifications)
- More precise translation for "the defence of [cityName]", to refer to the unit garrisoned in the attacked city ("la défense" doesn't sound well)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: namazulake <130637228+namazulake@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2023-04-26 22:08:34 +03:00
dc223f8cab Allow modders to use culture/faith conversion without providing the icons (#9275) 2023-04-25 09:05:05 +03:00
ea39fe4713 4.6.6 2023-04-24 17:42:13 +03:00
c7dde1bc41 Version rollout (#9273)
* Bump version and create initial changelog entry

* Completed German translation and fixed a few mistakes (#9266)

Co-authored-by: Birk Birkner <birkner@bbirkner.de>

* Update Polish.properties (#9264)

* Update Italian.properties (#9260)

* Update French.properties (#9258)

* Update Indonesian.properties (#9257)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
2023-04-24 17:37:40 +03:00
c9067df642 Remove 'reset to Dropbox' button since it's deprecated 2023-04-24 17:33:28 +03:00
0b3614d1df Remove experimental rendering (experiment unsuccessful) 2023-04-24 17:31:42 +03:00
ce76dee0fa 4.6.5 2023-04-23 10:11:22 +03:00
717e4befac Version rollout (#9256)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#9255)

Now, Indonesian translation is complete

* Fixing some typos in the German translation (#9236)

* Fixing some typos in the German translation

* Fixed another typo

* Fixed a huge amount of typos

Ran over it with a hunspell. Found a few other mistakes in the process.

* Fixed mistranslations in quotes

Fixed one translation that seemed to be made with a software translator.
Replaced a translation of a translation with the original quote.

---------

Co-authored-by: Birk Birkner <birkner@bbirkner.de>

* Fix typo in Polish.properties (#9233)

* Update Turkish.properties (#9227)

* Update Turkish.properties

* Add files via upload

* Update Spanish.properties (#9206)

* Update Spanish.properties

* Update Spanish.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
Co-authored-by: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
Co-authored-by: bread <77245194+breadtard@users.noreply.github.com>
Co-authored-by: Enesb852 <130827350+Enesb852@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-04-23 10:05:35 +03:00
45ac4c2d59 AbsoluteUnits - Sipahi, Hakkapeliitta (#9251) 2023-04-22 21:22:28 +03:00
a3de63efbe AbsoluteUnits - Janissary, Tercio, Musketeer, Minuteman (#9228) 2023-04-20 00:21:13 +03:00
2184c494fc Version rollout (#9224)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9223)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Russian localization (#9222)

* Update Russian localization

Just in case, for the "X attacked our unit Y", I have chosen to make it a bit less precise (not directly stating that "Y" is player's unit) because due to language's specifics it's practically impossible with this translation scheme to not make grammar error.

* fix

should have used copy-paste

* Update Polish.properties (#9215)

* Update Italian.properties (#9209)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Alex <64156241+Alex-1000@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-04-19 11:42:09 +03:00
2f25ed3053 Replaced hardcoded embarked sight with configurable
"Normal vision when embarked" replaced by "[+1] Sight <for [Embarked] units>"
2023-04-19 11:12:21 +03:00
e313f00f6d Version rollout (#9208)
* Bump version and create initial changelog entry

* Update French.properties (#9201)

* Translate Simplified_Chinese.properties (#9200)

4.6.2 Basic Translate

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: YaoSiQian <2229561981@qq.com>
2023-04-17 09:33:26 +03:00
4f30d27d0b Notifications can be "selected" (#9182)
* Allow "selecting" notifications

* NotificationsScroll remembers position relative to topRight

* NotificationsScroll tries to scroll selection into view

* Fix notification selection and scroll-into-view

* User option to control enlarging selected notifications

* Post-merge missed changes

* Move, flip and reword "Enlarge" option
2023-04-16 21:20:56 +03:00
ab1d823477 4.6.2 2023-04-16 15:01:43 +03:00
4c6c6e91fd Version rollout (#9199)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9195)

* Update Turkish.properties (#9193)

* Update Spanish.properties (#9192)

* Update French.properties (#9190)

* Update Hungarian.properties (#9187)

* Update Polish.properties (#9180)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Enesb852 <130827350+Enesb852@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-04-16 14:52:41 +03:00
90cac15c7f Fix more leaks of the actual Player count in random mode (#9196) 2023-04-16 14:20:08 +03:00
d15d8b0bf1 Make new "Charts" button translatable (#9191) 2023-04-15 21:03:35 +03:00
bc5e486b20 Resolves #9186
Atilla's Court -> Attila's Court, Guten tag -> Guten Tag
2023-04-15 21:00:17 +03:00
2ce145be1e Version rollout (#9179)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9170)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Hungarian.properties (#9161)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#9160)

* update Simplified_Chinese translation (#9159)

Co-authored-by: chr_56 <_>

* Update Ukrainian.properties (#9153)

* Update French.properties (#9152)

* Update Czech.properties (#9151)

translated some of the yet untranslated texts

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: brmaku <46785630+brmaku@users.noreply.github.com>
2023-04-13 16:20:25 +03:00
193114078b Show a highlight for the tile that seems most suitable to found a cit… (#9099)
* Show a highlight for the tile that seems most suitable to found a city (can be turned off in settings)

* Don't allow players to cheat through highlighting suggested map tiles for city founding.

* Don't pass whether cheating is allowed, but just decide based on whether civ is AI or not. That way it will also work correctly for automated settlers (by human players). Also show it in the first round, because why not. If the map generator puts us on a shitty starting tile, why not tell the player?

* Address comments

* Address comments
2023-04-13 15:43:46 +03:00
19b243abfe 'Display' options organized into subcatagories - kudos @Ouaz 2023-04-11 11:28:24 +03:00
bc9f75d6e4 Make new "notifications" option translatable (#9154) 2023-04-11 11:07:25 +03:00
f31d2a9a2a AbsoluteUnits - Turtle Ship, Ship of the Line, Sea Beggar (#9165) 2023-04-11 07:55:31 +03:00
a363edaa6a 4.6.0 2023-04-09 18:15:53 +03:00