diff --git a/ChangeLog.md b/ChangeLog.md index 7e09d56f..e8a7d27e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -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. diff --git a/EDMC.py b/EDMC.py index fb5dda13..022699ae 100755 --- a/EDMC.py +++ b/EDMC.py @@ -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 diff --git a/EDMCSystemProfiler.py b/EDMCSystemProfiler.py index 123ca5fc..c4883cec 100644 --- a/EDMCSystemProfiler.py +++ b/EDMCSystemProfiler.py @@ -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 diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 37e2ab4d..e371f3f2 100644 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -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 diff --git a/build.py b/build.py index 374562e2..c8e8a7a2 100644 --- a/build.py +++ b/build.py @@ -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 diff --git a/common_utils.py b/common_utils.py index ce3c7986..8cd9a149 100644 --- a/common_utils.py +++ b/common_utils.py @@ -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 diff --git a/companion.py b/companion.py index 2c920144..b94d4446 100644 --- a/companion.py +++ b/companion.py @@ -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. diff --git a/config/__init__.py b/config/__init__.py index 10f64692..d859c8f3 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -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" # # 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" diff --git a/config/linux.py b/config/linux.py index 39e98793..4c0690dd 100644 --- a/config/linux.py +++ b/config/linux.py @@ -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 diff --git a/config/windows.py b/config/windows.py index 6868493e..ae727c33 100644 --- a/config/windows.py +++ b/config/windows.py @@ -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 diff --git a/coriolis-update-files.py b/coriolis-update-files.py index f15d4067..f60eff75 100755 --- a/coriolis-update-files.py +++ b/coriolis-update-files.py @@ -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 diff --git a/dashboard.py b/dashboard.py index 60d5316f..9eb71dae 100644 --- a/dashboard.py +++ b/dashboard.py @@ -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 diff --git a/installer.py b/installer.py index 1ee79ddb..d7faf83f 100644 --- a/installer.py +++ b/installer.py @@ -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 diff --git a/journal_lock.py b/journal_lock.py index 8d90314e..19931752 100644 --- a/journal_lock.py +++ b/journal_lock.py @@ -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 diff --git a/killswitch.py b/killswitch.py index bec23ba8..af50a8c1 100644 --- a/killswitch.py +++ b/killswitch.py @@ -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 diff --git a/l10n.py b/l10n.py index 48197592..5f6c5298 100755 --- a/l10n.py +++ b/l10n.py @@ -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. diff --git a/loadout.py b/loadout.py index c465cdbd..2690133d 100644 --- a/loadout.py +++ b/loadout.py @@ -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 diff --git a/monitor.py b/monitor.py index bc1d44f0..2a82aa8f 100644 --- a/monitor.py +++ b/monitor.py @@ -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 diff --git a/outfitting.py b/outfitting.py index 3256da31..6d51295e 100644 --- a/outfitting.py +++ b/outfitting.py @@ -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 diff --git a/plug.py b/plug.py index 9297bc53..fd6b804e 100644 --- a/plug.py +++ b/plug.py @@ -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 diff --git a/plugins/common_coreutils.py b/plugins/common_coreutils.py index 2e3b58ae..2cefba34 100644 --- a/plugins/common_coreutils.py +++ b/plugins/common_coreutils.py @@ -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. diff --git a/plugins/coriolis.py b/plugins/coriolis.py index be0bd4be..007a8472 100644 --- a/plugins/coriolis.py +++ b/plugins/coriolis.py @@ -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. diff --git a/plugins/edastro_core.py b/plugins/edastro_core.py index 6e2be692..8d2bf25f 100644 --- a/plugins/edastro_core.py +++ b/plugins/edastro_core.py @@ -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. diff --git a/plugins/eddn.py b/plugins/eddn.py index 8b783c8f..91443f53 100644 --- a/plugins/eddn.py +++ b/plugins/eddn.py @@ -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. diff --git a/plugins/edsm.py b/plugins/edsm.py index 46c8ef4e..815deb78 100644 --- a/plugins/edsm.py +++ b/plugins/edsm.py @@ -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. diff --git a/plugins/edsy.py b/plugins/edsy.py index 109bb2f0..9e0d59b4 100644 --- a/plugins/edsy.py +++ b/plugins/edsy.py @@ -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. diff --git a/plugins/inara.py b/plugins/inara.py index be3f517b..aad47ecf 100644 --- a/plugins/inara.py +++ b/plugins/inara.py @@ -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. diff --git a/plugins/spansh_core.py b/plugins/spansh_core.py index 5a3e541d..53eab113 100644 --- a/plugins/spansh_core.py +++ b/plugins/spansh_core.py @@ -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. diff --git a/protocol.py b/protocol.py index 774a012e..77b3abef 100644 --- a/protocol.py +++ b/protocol.py @@ -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. """ diff --git a/scripts/build_changelog.py b/scripts/build_changelog.py index 3406ed50..4be48f1d 100644 --- a/scripts/build_changelog.py +++ b/scripts/build_changelog.py @@ -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. """ diff --git a/ships.json b/ships.json index 65a1c2df..77c01179 100644 --- a/ships.json +++ b/ships.json @@ -179,7 +179,7 @@ "hullMass": 230, "reserveFuelCapacity": 0.57 }, - "Caspain Explorer": { + "Caspian Explorer": { "hullMass": 950, "reserveFuelCapacity": 0.77 } diff --git a/stats.py b/stats.py index 67fc9379..2dcf63dd 100644 --- a/stats.py +++ b/stats.py @@ -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 diff --git a/theme.py b/theme.py index fe431ebb..68a1a391 100644 --- a/theme.py +++ b/theme.py @@ -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. diff --git a/timeout_session.py b/timeout_session.py index 55fc4dc0..2cfc90bb 100644 --- a/timeout_session.py +++ b/timeout_session.py @@ -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 diff --git a/ttkHyperlinkLabel.py b/ttkHyperlinkLabel.py index 3d62185d..0b1f4fa0 100644 --- a/ttkHyperlinkLabel.py +++ b/ttkHyperlinkLabel.py @@ -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: diff --git a/update.py b/update.py index 2de49eef..a0ccca04 100644 --- a/update.py +++ b/update.py @@ -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 diff --git a/util/text.py b/util/text.py index 84af758b..d91b60fa 100644 --- a/util/text.py +++ b/util/text.py @@ -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 diff --git a/util_ships.py b/util_ships.py index 4f99e731..c205976c 100644 --- a/util_ships.py +++ b/util_ships.py @@ -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