Commit Graph
1599 Commits
Author SHA1 Message Date
Athanasius ad642f2849 Merge branch 'main' into develop 2020-07-15 12:04:09 +01:00
Athanasius f7aa85a02d Merge branch 'stable' into main 2020-07-15 12:03:47 +01:00
Athanasius d39d78bb39 Release 4.0.2.0 Release/4.0.2.0 2020-07-15 12:00:03 +01:00
Athanasius 43e18c0c84 Merge branch 'stable' into main 2020-07-15 11:50:39 +01:00
Athanasius 8759dd4912 Merge branch 'main' of https://github.com/EDCD/EDMarketConnector into main 2020-07-15 11:50:15 +01:00
Athanasius 09be5505bc Clarify what stable and beta branches may contain. Describe release tags.
* Both `stable` and `beta` might contain extra commits for hotfixes beyond
what is currently released.
* Describe the Stable Release tag form, and point out that currently
the pre-release tag form is the same.
2020-07-15 11:48:33 +01:00
Athanasius 1a16d6971a docs/Releasing.md: re-structure and clarifications.
I'd been deviating slightly from what it said, so I've updated to what I
now actually do.
2020-07-15 11:48:33 +01:00
Athanasius 1781b6657c Contributing.md: beta can lag behind main/stable/develop 2020-07-15 11:48:33 +01:00
Athanasius 996f317130 Contributing.md: master is deprecated, use main. 2020-07-15 11:48:33 +01:00
Athanasius 1bf8e292a8 Merge pull request #606 from EDCD/fix/604-EDMC-version-check
Restore 'EDMC -v' to announcing newer versions.
2020-07-15 11:46:43 +01:00
Athanasius c51ba1c445 Clarify what stable and beta branches may contain. Describe release tags.
* Both `stable` and `beta` might contain extra commits for hotfixes beyond
what is currently released.
* Describe the Stable Release tag form, and point out that currently
the pre-release tag form is the same.
2020-07-15 10:43:30 +01:00
Athanasius b1e1fc3a34 Restore 'EDMC -v' to announcing newer versions.
I got too enthusiastic in 3ff77c3c54 when
I removed the "cut it down to A.BC" code.  This restores the old output,
but using a less confusing if/else.
2020-07-15 10:27:29 +01:00
Athanasius a5becb7f7c Merge branch 'stable' into main 2020-07-14 11:43:57 +01:00
Athanasius 173733cc44 Merge branch 'stable' into develop 2020-07-14 11:43:30 +01:00
Athanasius 6f004e6df7 Merge pull request #602 from EDCD/release-4.0.1.0
Release 4.0.1.0
2020-07-14 11:36:40 +01:00
Athanasius 87530e32b1 edmarketconnector.xml: 4.0.1.0 Release/4.0.1.0 2020-07-14 11:34:26 +01:00
Athanasius 07b6002775 Release 4.0.1.0 appversion and ChangeLog.md 2020-07-14 11:27:55 +01:00
Athanasius ec32849a17 plugins/eddb: Fallback to system_name if no system_address
* Cleans up imports.
* Fixes some '<tab># ...' to use 2 spaces.
* Add type hints to system_url().
* Always store, even if not current provider: this.{system_address,
  station_marketid,system_population}
2020-07-13 22:12:29 +01:00
Athanasius f3e25f0340 EDDB system URL: Don't pick up system_address from CAPI at all 2020-07-13 21:03:57 +01:00
Athanasius 0d045d54f4 docs/Releasing.md: re-structure and clarifications.
I'd been deviating slightly from what it said, so I've updated to what I
now actually do.
2020-07-13 17:46:57 +01:00
Athanasius f95e55d3d4 Contributing.md: beta can lag behind main/stable/develop 2020-07-13 13:40:34 +01:00
Athanasius 6a890188bc Contributing.md: master is deprecated, use main. 2020-07-13 13:38:12 +01:00
Athanasius 7e888f5924 Add Changelog.md to distributed files. Release/4.0.0.0 2020-07-13 12:30:48 +01:00
Athanasius 6184a9cc32 edmarketconnector.xml: Update for Windows 4.0.0.0 2020-07-13 12:20:45 +01:00
Athanasius a0c1221446 Increase version to 4.0.0.0 2020-07-13 12:09:05 +01:00
Athanasius 42f2fa4ed1 ChangeLog: Additions for 4.0.0.0
* Removed old 3.99.5.0 header.
* Correct *all* URLs referencing 'master' branch to 'main'.
* Add note for developers to check Contributing.md.
2020-07-13 12:08:46 +01:00
Athanasius ea0d6471d2 Contributing.md: Fix 'contentions' typo 2020-07-13 12:04:44 +01:00
Athanasius 0a3c574137 ChangeLog: Initial 4.0.0.0 text
This has amalgamated the 3.99.X.0 changelogs into one.

Still need to check if anything else needs adding.
2020-07-13 11:59:57 +01:00
Athanasius 8d0cd8c9dc PLUGINS.md: Change header to 'Developer Plugin Documentation' 2020-07-13 11:59:10 +01:00
Athanasius b9b22edf5d Update translations
Minor st-Latn-BA changes.
2020-07-13 11:45:39 +01:00
Athanasius 7d0bd6e4bc Removes py2exe from requirements.txt
We specify version and where to get it in docs/Releasing.md, and it's
not "pip install"-able, so don't cause errors with this.
2020-07-13 10:53:12 +01:00
Athanasius dec2f3d041 theme not them 2020-07-12 23:15:47 +01:00
Athanasius f96b00f8ef Merge pull request #574 from A-UNDERSCORE-D/enhancement/cleanup-edshipyard
cleanup edshipyard
2020-07-12 20:50:25 +01:00
Athanasius 04090842d7 Add a few more allowed plugin imports in docs
* L10n
* theme.theme
* plug allows for flags.
* monitor.gamerunning()
2020-07-12 19:54:23 +01:00
Athanasius e473493509 Merge pull request #593 from EDCD/issue/545-plugin-api-doc
Issue/545 plugin api doc
2020-07-12 19:27:17 +01:00
Athanasius 71bb14a737 Document allowed imports for PLUGINS
* List added in 'Available imports' section of PLUGINS.md
* Various *.py files now have comments about things being allowed for
 plugin import.
2020-07-12 19:25:47 +01:00
Athanasius 63f5db3785 plugins/inara.py makes no use of import companion
So remove it.
2020-07-12 19:24:16 +01:00
Athanasius c25120e0aa plugins/edsm.py makes no use of import companion
So remove it.
2020-07-12 19:10:57 +01:00
Athanasius 2bd6e4cb1c PLUGINS.md: Flesh out plugin API docs
* Note in monitor.py to update the docs if anything changed about the
 'state' dictionary.
* Expand on arguments to all plugin call-ins.
* Particularly what the 'state' diction passed to journal_entry()
 contains.
* The contents of the `data` dictionary passed to `cmdr_data()`.
2020-07-12 18:10:16 +01:00
Athanasius 37c00d31ee General text re-flow to make subsequent changes more obvious.
Also fixed formatting of some of the embedded code.
2020-07-12 16:25:20 +01:00
Athanasius ae62bec63d Remove extraneous 'e '
*shakes fist at PyCharm*
2020-07-12 16:07:19 +01:00
Athanasius 690b8b0da3 Use 'main' branch for 'migrate plugins' URL 2020-07-12 15:59:40 +01:00
Athanasius 6910696172 Merge pull request #591 from EDCD/feature/589-sort-plugins-for-load
sort internal plugins before loading
2020-07-12 15:51:50 +01:00
Athanasius 076eab9e22 sort internal plugins before loading
This is already done for 'found' plugins, so let's avoid any potnetial
future surprise with the internal ones as well.

close #589
2020-07-12 15:50:49 +01:00
Athanasius 624f2a7907 Changelog and version bump for 3.99.5.0 Release/3.99.5.0 2020-07-11 21:03:48 +01:00
Athanasius c78d9241df Merge pull request #573 from A-UNDERSCORE-D/fix/477-inara-cargo-slow-update
Fixed updating inara cargo only on major events
2020-07-11 20:04:17 +01:00
A_D f43141202b Removed debug print 2020-07-11 20:55:18 +02:00
A_D 061fbddb2d Fixed wording of comment on last_update_time 2020-07-11 20:53:48 +02:00
A_D 9b82464f88 Fixed updating inara cargo only on major events
This works by checking on _any_ event the status of the cargo vs the
current stored version. If the live cargo differs from the updated
cargo, _and_ we have not sent any update in the past 45 seconds (as this
would have contained the cargo anyway), we queue an actual send to the
API.

This unfortunately isn't checked only when docked, but on the plus side
miners will be happy to have their cargo updated relatively often.

Fixes #477. Possibly not quite what they wanted, but its about as close
as this will get
2020-07-11 20:53:47 +02:00
Athanasius 96f7457ae3 Merge pull request #587 from EDCD/fix/586-EDDB-system-links
Fix/586 eddb system links
2020-07-11 19:48:19 +01:00