* Test move to java 11
* Expanded metaspace size as per suggestion in https://github.com/gradle/gradle/issues/8354 to solve android list out of metaspace fail
* Master back to normal
Instead of forcing reflection to depend on latest kotlin version, I have a feeling the dependency is due to older mockito depending on older reflection.
Also added android:exported tags so that android:processDebugMainManifest doesn't fail the gradle check.
I think this is only failing locally because I bumped the compileSdkVersion to 31, but that means it'll need to go in soon anyway.
* t1
* Only run on tag
* Added Google Play service account
* t3 - now with correct signing location
* whatsNewDirectory
* This is just to test if the automatic upload to Google Play is working
* Removed Android SDK
not sure it's needed for android build and signing
* Returned branch to master
Should be final!
* Removed the civ introduction trade option
Left in the minimum amount of code to ensure that saves with a pending
introduction trade do not break (any such pending trades are cancelled).
The left-in introduction trade code can be fully removed in a later
version.
* Added back civ introduction trades as a mod option
Also made the gold value of introducation trades moddable.
* Made civ introduction trade invalid if receiver already knows the civ
This prevents players from sending two AI civs introduction trades for
each other in the same turn and profiting from both. This therefore
fixes#4272.
* Applied requested changes
* Removed a spurious space
* Made water oil wells require the Refrigeration tech
Oil wells can now only be created on water with the refrigeration
technology.
This is not the ideal solution: it would be preferable to support
multiple improvements for a single resource, to add offshore platforms
as a separate improvement for coastal oil that requires refrigeration
and to disable building oil wells on coast. Allowing multiple
improvements for a resource would however be a much more significant
refactor.
* Added back "terrainsCanBeBuiltOn": ["Coast"]
* Unit action constants and worker unique cleanup
* Replace unit action constants with enum properties - patch1
* Replace unit action constants with enum properties - patch2
* CityScreen Buy button rework
- e.g. "Buy" for Missionary
- Info pane staying even when building no longer offered
- Purchase Prompt a little prettier
* Urgent Fix - noMods switch default
* CityScreen Buy button rework - patch1
* city-state bonuses graded depending on friend or ally
* siam militaristic UP, cleaned up presentation
* fix strings
* move city state modifiers to json
* city-state bonuses graded depending on friend or ally
* siam militaristic UP, cleaned up presentation
* fix strings
* move city state modifiers to json
* Restructure eras.json
* reduce indentation in DiplomacyManager.kt
* Add fallback values in cas of missing json definitions
* review edits
* fix conflicts???
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
