1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-17 01:22:19 +03:00

3708 Commits

Author SHA1 Message Date
A_D
9466d8fc81
reorder new file checks
we want to finish our current file, if anything, before continuing onto a new file
2021-08-04 15:43:00 +02:00
Athanasius
5bf3868f80
Merge branch 'main' into develop 2021-08-03 16:48:50 +01:00
Athanasius
03817de3c8
Windows Build: Set prerelease true on draft release 2021-08-03 16:48:29 +01:00
Athanasius
d0d929c204
Merge branch 'main' into develop 2021-08-03 16:38:35 +01:00
Athanasius
c3539cfcad
Merge pull request #1213 from A-UNDERSCORE-D/actions/auto-release-2
Switch the action template used for releases
2021-08-03 16:29:05 +01:00
A_D
f89ba3b7d1
Switch the action template used for releases 2021-08-03 17:24:52 +02:00
Athanasius
e431af3f9a
Merge branch 'main' into develop 2021-08-03 16:01:05 +01:00
Athanasius
ad08d8f6f2
Merge pull request #1212 from A-UNDERSCORE-D/actions/auto-release
Automatically create releases with github actions
2021-08-03 15:59:11 +01:00
A_D
0bc8ff9a0b
update automatic builds docs 2021-08-03 15:58:55 +02:00
A_D
9365d4e774
dont create releases on manual builds 2021-08-03 15:54:02 +02:00
A_D
2030fd5fc6
added auto-release job 2021-08-03 15:10:08 +02:00
Athanasius
67de3a31ab
Merge pull request #1209 from EDCD/dependabot/pip/develop/types-requests-2.25.2
build(deps-dev): bump types-requests from 2.25.1 to 2.25.2
2021-08-02 18:06:35 +01:00
dependabot[bot]
89a24e5cbb
build(deps-dev): bump types-requests from 2.25.1 to 2.25.2
Bumps [types-requests](https://github.com/python/typeshed) from 2.25.1 to 2.25.2.
- [Release notes](https://github.com/python/typeshed/releases)
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-requests
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-02 17:04:11 +00:00
Athanasius
c481aa088b
Merge pull request #1205 from EDCD/dependabot/pip/develop/types-requests-2.25.1
build(deps-dev): bump types-requests from 2.25.0 to 2.25.1
2021-07-30 18:03:44 +01:00
dependabot[bot]
b97696c522
build(deps-dev): bump types-requests from 2.25.0 to 2.25.1
Bumps [types-requests](https://github.com/python/typeshed) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/python/typeshed/releases)
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-requests
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-30 17:02:42 +00:00
Athanasius
b84695e6b7
Merge pull request #1203 from EDCD/dependabot/pip/develop/isort-5.9.3
build(deps-dev): bump isort from 5.9.2 to 5.9.3
2021-07-30 16:40:26 +01:00
Athanasius
23d172a311
config: post-release appversion bump to 5.1.3-beta0 2021-07-29 20:38:39 +01:00
Athanasius
8f31c589e9
Merge branch 'develop' 2021-07-29 20:36:12 +01:00
Athanasius
65e515e33e
Changelog: Fix minor grammar error. 2021-07-29 20:35:40 +01:00
Athanasius
bf3cd86e26
Merge branch 'develop' 2021-07-29 20:23:49 +01:00
dependabot[bot]
2568bc4568
build(deps-dev): bump isort from 5.9.2 to 5.9.3
Bumps [isort](https://github.com/pycqa/isort) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.9.2...5.9.3)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-29 17:03:10 +00:00
Athanasius
066bd60b55
Release 5.1.2: Translations updated Release/5.1.2 2021-07-29 16:03:56 +01:00
Athanasius
36eeb802a3
Release 5.1.2: version bump & changelog 2021-07-29 15:58:15 +01:00
Athanasius
d2d0aad425
Merge pull request #1200 from A-UNDERSCORE-D/fix/967/Only-read-from-gitversion-once-per-run
Cache appversion when it is created
2021-07-29 15:12:36 +01:00
Athanasius
2098600aa8
Merge pull request #1186 from A-UNDERSCORE-D/enhancement/odyssey-update-5
Enhancement/odyssey update 5
2021-07-29 15:05:34 +01:00
Athanasius
c4fee17127
Merge pull request #1202 from EDCD/dependabot/pip/develop/flake8-json-21.7.0
build(deps-dev): bump flake8-json from 21.1.0 to 21.7.0
2021-07-27 18:56:34 +01:00
dependabot[bot]
1c77f4daa2
build(deps-dev): bump flake8-json from 21.1.0 to 21.7.0
Bumps [flake8-json](https://gitlab.com/pycqa/flake8-json) from 21.1.0 to 21.7.0.
- [Release notes](https://gitlab.com/pycqa/flake8-json/tags)
- [Commits](https://gitlab.com/pycqa/flake8-json/compare/21.1.0...21.7.0)

---
updated-dependencies:
- dependency-name: flake8-json
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-27 17:03:33 +00:00
A_D
de8f7b8e5f
Cache appversion when it is created
closes EDCD/EDMarketconnector#967
2021-07-22 06:15:34 +02:00
Athanasius
08d937b680
Merge pull request #1197 from EDCD/dependabot/pip/develop/requests-2.26.0
build(deps): bump requests from 2.25.1 to 2.26.0
2021-07-13 18:08:37 +01:00
dependabot[bot]
335642686a
build(deps): bump requests from 2.25.1 to 2.26.0
Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.26.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.25.1...v2.26.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-13 17:03:24 +00:00
Athanasius
ea70f79f05
docs/Releasing: Fix reference to Killswitches.md 2021-07-13 17:51:11 +01:00
Athanasius
ad068313f0
Merge pull request #1193 from EDCD/dependabot/pip/develop/isort-5.9.2
build(deps-dev): bump isort from 5.9.1 to 5.9.2
2021-07-08 18:05:27 +01:00
dependabot[bot]
010f36c2ac
build(deps-dev): bump isort from 5.9.1 to 5.9.2
Bumps [isort](https://github.com/pycqa/isort) from 5.9.1 to 5.9.2.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.9.1...5.9.2)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-08 17:04:06 +00:00
Athanasius
5d3b635ec4
Merge pull request #1192 from EDCD/dependabot/pip/develop/pep8-naming-0.12.0
build(deps-dev): bump pep8-naming from 0.11.1 to 0.12.0
2021-07-07 18:06:08 +01:00
dependabot[bot]
69957ea3af
build(deps-dev): bump pep8-naming from 0.11.1 to 0.12.0
Bumps [pep8-naming](https://github.com/PyCQA/pep8-naming) from 0.11.1 to 0.12.0.
- [Release notes](https://github.com/PyCQA/pep8-naming/releases)
- [Changelog](https://github.com/PyCQA/pep8-naming/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/PyCQA/pep8-naming/compare/0.11.1...0.12.0)

---
updated-dependencies:
- dependency-name: pep8-naming
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 17:03:43 +00:00
A_D
7c78b40090
always update with journal data 2021-07-07 11:02:11 +02:00
A_D
4e7366bee0
updated comment 2021-07-05 11:17:19 +02:00
A_D
c898a9226a
added forwardslash to additional keys 2021-07-05 11:12:06 +02:00
A_D
3bde283048
make comments congruent with convention from contributing commandment 2021-07-03 17:30:26 +02:00
A_D
dec2e07ce0
revert previous commit, handle \ in lang names 2021-07-03 17:23:30 +02:00
A_D
edbf1263a9
Dont store version on loadgame, its content is faulty 2021-07-03 17:14:25 +02:00
A_D
6a296d4920
fixed inara per-event killswitch doing nothing 2021-07-03 15:48:25 +02:00
A_D
1e691d306e
Added support for resupply event
its a reskinned backpack, so thats how its being handled
2021-07-03 13:22:39 +02:00
A_D
d63b6ad782
removed suits["slots"] (for now) 2021-07-01 12:47:07 +02:00
A_D
67df2efc8a
DRY-ed setting version info
Also removed some uneeded type ignores
2021-07-01 12:27:15 +02:00
A_D
e11193110f
removed dashboard import 2021-06-30 14:26:45 +02:00
A_D
1a3dad34b7
Add support for SuitLoadout related added info
This is mostly classes and mods for weapons, and classes for suits. I
did not do any updating passed what we already did, I simply added the
fields where needed.

This means that if our tracking is incorrect it will still be incorrect,
but full on tracking will wait for OO based state storage to prevent
whoopsies and other silliness.
2021-06-30 14:23:25 +02:00
A_D
aa4e17c846
Add support for new fields on LoadGame
These are the same as the ones on FileHeader, but it wont hurt to update
them here anyway, if they exist. Likely they wont have changed, but just
in case
2021-06-30 14:07:16 +02:00
Athanasius
c0f0e3bc62 Python: Bump version to 3.9.6 2021-06-28 22:11:13 +01:00
Athanasius
85814f5523
Merge pull request #1184 from EDCD/dependabot/pip/develop/watchdog-2.1.3
build(deps): bump watchdog from 2.1.2 to 2.1.3
2021-06-28 18:07:04 +01:00