ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-10-22 17:22:09 +03:00
Code Issues Projects Releases Wiki Activity

[2568] Fix Ships JSON Typo

Browse Source
This commit is contained in:
David Sangrey committed 2025-12-25 01:36:24 -05:00
1 parent e9877fa81a
commit beb68efae8
38 files changed
+48 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog.md
+10
View File
@@ -2,6 +2,16 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are
---
* We currently test against, and package with, Python 3.13, 64-bit.
---
Release 6.0.1
===
This release fixes a bug with 6.0.0 for Caspian Explorer pilots due to a typo and clarifies the license in use with EDMC.
**Changes and Enhancements**
* Clarifies docstrings to more accurately reflect EDMC's use of GPL-2.0-or-later license.
**Bug Fixes**
* Fixes a typo in the Ships record that would cause the Caspian Explorer to not be recorded poperly.
Release 6.0.0
===
Welcome to EDMC 6.0. This build represents one of the most significant internal updates to EDMC in recent memory. It includes a complete overhaul of the configuration system, full x64-bit build support, major plugin system enhancements (including enable/disable support), new core plugins, and additional updates across the codebase.
EDMC.py
+1 -1
View File
@@ -3,7 +3,7 @@
EDMC.py - Command-line interface. Requires prior setup through the GUI.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
EDMCSystemProfiler.py
+1 -1
View File
@@ -3,7 +3,7 @@
EDMCSystemProfiler.py - GUI or Command-Line Tool to Print Diagnostic Information about EDMC.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
import argparse
EDMarketConnector.py
+1 -1
View File
@@ -3,7 +3,7 @@
EDMarketConnector.py - Entry point for the GUI.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
build.py
+1 -1
View File
@@ -2,7 +2,7 @@
build.py - Build the program EXE.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
import os
common_utils.py
+1 -1
View File
@@ -2,7 +2,7 @@
common_utils.py - Common functions and modules.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
companion.py
+1 -1
View File
@@ -2,7 +2,7 @@
companion.py - Handle use of Frontier's Companion API (CAPI) service.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
Deals with initiating authentication for, and use of, CAPI.
config/__init__.py
+2 -2
View File
@@ -2,7 +2,7 @@
__init__.py - Code dealing with the configuration of the program.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
Windows uses the Registry to store values in a flat manner.
@@ -54,7 +54,7 @@ appcmdname = "EDMC"
# <https://semver.org/#semantic-versioning-specification-semver>
# Major.Minor.Patch(-prerelease)(+buildmetadata)
# NB: Do *not* import this, use the functions appversion() and appversion_nobuild()
_static_appversion = "6.0.0"
_static_appversion = "6.0.1"
_cached_version: semantic_version.Version | None = None
copyright = "© 2015-2019 Jonathan Harris, 2020-2025 EDCD"
config/linux.py
+1 -1
View File
@@ -2,7 +2,7 @@
linux.py - Linux config implementation.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
config/windows.py
+1 -1
View File
@@ -2,7 +2,7 @@
windows.py - Windows config implementation.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
coriolis-update-files.py
+1 -1
View File
@@ -3,7 +3,7 @@
coriolis-update-files.py - Build ship and module databases from https://github.com/EDCD/coriolis-data/.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This script also utilizes the file outfitting.csv. Due to how collate.py
dashboard.py
+1 -1
View File
@@ -2,7 +2,7 @@
dashboard.py - Handle the game Status.json file.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
installer.py
+1 -1
View File
@@ -2,7 +2,7 @@
installer.py - Build the Installer.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
import subprocess
journal_lock.py
+1 -1
View File
@@ -2,7 +2,7 @@
journal_lock.py - Locking of the Journal Directory.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
killswitch.py
+1 -1
View File
@@ -2,7 +2,7 @@
killswitch.py - Fetch kill switches from EDMC Repo.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
l10n.py
+1 -1
View File
@@ -3,7 +3,7 @@
l10n.py - Localize using OSX-Style Strings.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
Localization with gettext is a pain on non-Unix systems.
loadout.py
+1 -1
View File
@@ -2,7 +2,7 @@
loadout.py - Export ship loadout in Companion API json format.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
monitor.py
+1 -1
View File
@@ -2,7 +2,7 @@
monitor.py - Monitor for new Journal files and contents of latest.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
outfitting.py
+1 -1
View File
@@ -2,7 +2,7 @@
outfitting.py - Code dealing with ship outfitting.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
plug.py
+1 -1
View File
@@ -2,7 +2,7 @@
plug.py - Plugin API.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
plugins/common_coreutils.py
+1 -1
View File
@@ -2,7 +2,7 @@
common_coreutils.py - Common Plugin Functions.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This is an EDMC 'core' plugin.
plugins/coriolis.py
+1 -1
View File
@@ -2,7 +2,7 @@
coriolis.py - Coriolis Ship Export.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This is an EDMC 'core' plugin.
plugins/edastro_core.py
+1 -1
View File
@@ -2,7 +2,7 @@
edastro_core.py - Exporting Data to EDAstro.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This is an EDMC 'core' plugin.
plugins/eddn.py
+1 -1
View File
@@ -2,7 +2,7 @@
eddn.py - Exporting Data to EDDN.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This is an EDMC 'core' plugin.
plugins/edsm.py
+1 -1
View File
@@ -2,7 +2,7 @@
edsm.py - Handling EDSM Data and Display.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This is an EDMC 'core' plugin.
plugins/edsy.py
+1 -1
View File
@@ -2,7 +2,7 @@
edsy.py - Exporting Data to EDSY.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This is an EDMC 'core' plugin.
plugins/inara.py
+1 -1
View File
@@ -2,7 +2,7 @@
inara.py - Sync with INARA.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This is an EDMC 'core' plugin.
plugins/spansh_core.py
+1 -1
View File
@@ -2,7 +2,7 @@
spansh_core.py - Spansh URL provider.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
This is an EDMC 'core' plugin.
protocol.py
+1 -1
View File
@@ -2,7 +2,7 @@
protocol.py - Protocol Handler for cAPI Auth.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
scripts/build_changelog.py
+1 -1
View File
@@ -4,7 +4,7 @@
build_changelog.py - Read the latest changelog file and format for the Forums and Reddit.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
ships.json
+1 -1
View File
@@ -179,7 +179,7 @@
"hullMass": 230,
"reserveFuelCapacity": 0.57
},
"Caspain Explorer": {
"Caspian Explorer": {
"hullMass": 950,
"reserveFuelCapacity": 0.77
}
stats.py
+1 -1
View File
@@ -2,7 +2,7 @@
stats.py - CMDR Status Information.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
theme.py
+1 -1
View File
@@ -2,7 +2,7 @@
theme.py - Theme support.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
Because of various ttk limitations this app is an unholy mix of Tk and ttk widgets.
timeout_session.py
+1 -1
View File
@@ -2,7 +2,7 @@
timeout_session.py - requests session with timeout adapter.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
ttkHyperlinkLabel.py
+1 -1
View File
@@ -2,7 +2,7 @@
ttkHyperlinkLabel.py - Clickable ttk labels.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
In addition to standard ttk.Label arguments, takes the following arguments:
update.py
+1 -1
View File
@@ -2,7 +2,7 @@
update.py - Checking for Program Updates.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
util/text.py
+1 -1
View File
@@ -2,7 +2,7 @@
text.py - Dealing with Text and Bytes.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
from __future__ import annotations
util_ships.py
+1 -1
View File
@@ -2,7 +2,7 @@
util_ships.py - Ship Utilities.
Copyright (c) EDCD, All Rights Reserved
Licensed under the GNU General Public License.
Licensed under the GNU General Public License v2 or later.
See LICENSE file.
"""
import os