merge master #177
Merged
merge master #177
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ce, essentially emulating hunting season
…ith food instead of having cities grow when building with food.
…no longer applies to the first pop that is.
…fect the food threshold of a pop 0 city anymore, that's the job of the BASE_CITY_GROWTH_THRESHOLD global define.
…ed issue with three myths
…umn as building themselves
…placed in tech tree screen) is most advanced tech
…ather than bundle that source in to the `"from other"` line.
- to tech Scavening and some associated bonuses - unification of v.Chr. and n.Chr. abbreviations - and more
…nts are now valid
feat(Language): German translations
… soon after requirement obsoletion
…k, Astrological signs group wonders are exception
also switched some getInfoTypeForString calls
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.