* City-level resources are...
- Not displayed in civ top bar
- Not considered civ-level resources (for trade, non-city conditionals, etc)
- Are explicitly treated in city conditionals
- ARE considered for constructing buildings requiring resource
- ARE NOT considered for construction units requiring resource
* getCityResources separates resources by origin so we need to sum them - kudos @SeventhM
* CR fixes
* Added new Civilization.getResourceAmount function
* More usages of civInfo.getResourceAmount()
* Don't add city resource table if it's empty
* Extract AnimatedMenuPopup from UnitUpgradeMenu to make its basic idea reusable
* Rebase UnitUpgradeMenu onto AnimatedMenuPopup
* Add SoundPlayer.playRepeated for future reusability
* Move UnitUpgradeMenu to popups package
* Reuse playRepeated in PromotionPickerScreen
* Reuse playRepeated in PromotionPickerScreen - clean up imports
* Tighten mod check severity and selectivity for unit-producing triggered Uniques
* Prettify display of mod check results by suppressing dupes and hiding conditionals from tr()
* Extra confirmation to play with errors, colors, improved handling of mod checkboxes
* Tweaks to improved mod checking in new game
* Dynamic mod categories from online query
* Move Working string to Constants
* Move Mod categories to json
* Move Mod categories to json - UI
* Move Mod categories to json - initial json
* Popups get the ability to scroll only the content without the buttons
* Centralize LoadingPopup
* Split non-WorldScreenMenuPopup classes off from that file
* Linting
* Nicer music playback dialog
* Translation templates
* Unit upgrade tooltip in overview
* Unit upgrade tooltip in action table
* Unit upgrade tooltip in action table - colored Key
* Unit upgrade in Overview - reselect
* Fix merge problems and FormattedLine color markup ability
* Relax MarkupRenderer.render lines parameter type
* Skin has a getColor shortcut - use it
* Unit overview upgrade icons now open a menu instead of upgrading immediately
* Unit Overview upgrade - "Mid" buttons
* Unit Overview upgrade - reorg
* Allow mod preview image to be a jpg
* Allow preview images from WIP mods lacking github url
* Wiki preview.jpg
* Allow mod preview image to be a jpg - review
* 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
* Resource stockpiles!
* toString extension including sign (+/-)
* Trigger uniques to provide/consume stockpiled resources
* Fixed build
* Display 'per turn' for stockpiled resources that are consumed per turn
* "Costs [amount] [resource]" works!
* Stockpile unique costs are displayed in construction button
* Added unique to prevert certain resources from being traded
