1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 07:47:14 +03:00

Merge branch 'develop' into python3

This commit is contained in:
Athanasius 2020-07-05 20:50:29 +01:00
commit 2f9b564f90
7 changed files with 60 additions and 3 deletions

32
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug, unconfirmed
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. Windows 10]
- If applicable: Browser [e.g. chrome, safari]
- Version [e.g. 3.99.0.0 - See 'Help > About E:D Market Connector']
**Additional context**
Add any other context about the problem here.

View File

@ -0,0 +1,14 @@
---
name: New translation language
about: New languages for translations
title: "[Translations] New language - "
labels: Translations
assignees: ''
---
Language: the new translation you'd like to help add.
**You should only open an issue if you're able to contribute to the new translation yourself.**
See https://github.com/EDCD/EDMarketConnector/wiki/Translations for guidelines.

View File

@ -1,6 +1,16 @@
This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first).
---
Pre-Release 3.99.2.0
===
Consider this as 'beta2' for the following full '4.0.0.0' release.
* Added Swedish to the translated languages. Thanks to Gurra.
* Will throw an exception, rather than a Segmentation Fault, if run on Linux
without DISPLAY properly set.
* Corrects setting of WinSparkle (updates checking) options to be under the
new 'EDCD' Registry key.
Pre-Release 3.99.1.0
===
Consider this as 'beta1' for the following full '4.0.0.0' release.

View File

@ -446,7 +446,7 @@
"Ships" = "Skepp";
/* Setting to decide which ship outfitting website to link to - either E:D Shipyard or Coriolis. [prefs.py] */
"Shipyard" = "Webbsida för översikt av skepp";
"Shipyard" = "Översikt av skepp";
/* Empire rank. [stats.py] */
"Squire" = "Squire";

View File

@ -356,6 +356,7 @@ Acknowledgements
* Thanks to Armando Ota for the Slovenian translation.
* Thanks to Cmdr Mila Strelok for the Spanish translation.
* Thanks to Taras Velychko for the Ukranian translation.
* Thanks to Gurra for the Swedish translation.
* Thanks to [Athanasius](https://github.com/Athanasius) for the port to Python 3.
* Thanks to [Ian Norton](https://github.com/inorton) for plugin support.
* Thanks to [Cmdr Anthor](https://github.com/EDSM-NET) and [James Muscat](https://github.com/jamesremuscat) for [EDDN](https://github.com/EDSM-NET/EDDN/wiki).

View File

@ -8,7 +8,7 @@ from sys import platform
appname = 'EDMarketConnector'
applongname = 'E:D Market Connector'
appcmdname = 'EDMC'
appversion = '3.99.1.0'
appversion = '3.99.2.0'
copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'
update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml'

View File

@ -58,7 +58,7 @@ Pre-Packaging Steps
Before you create a new install each time you should:
1. Ensure the data sourced from coriolis.io is up to date and works:
1. Update the `coriolis-data` repo.
1. Update the `coriolis-data` repo. **NB: You will need 'npm' installed for this.**
1. Run `coriolis.py` to update `modules.p` and `ships.p`
1. XXX: Test ?
1. Ensure translations are up to date, see [Translations.md](Translations.md).