From e5f99c29548356993a62ec743da8d61f1b2cad4b Mon Sep 17 00:00:00 2001
From: David Sangrey <rixxan@hullseals.space>
Date: Wed, 8 May 2024 21:56:52 -0400
Subject: [PATCH 1/3] [#2228] Add SCO Module Information
---
edshipyard.py | 4 +-
modules.json | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 212 insertions(+), 2 deletions(-)
diff --git a/edshipyard.py b/edshipyard.py
index 15936dfc..2c29959f 100644
--- a/edshipyard.py
+++ b/edshipyard.py
@@ -178,8 +178,8 @@ def export(data, filename=None) -> None: # noqa: C901, CCR001
# a locale that uses comma for decimal separator.
except ZeroDivisionError:
range_unladen = range_laden = 0.0
- string += (f'Range : {range_unladen:.2f} LY current without cargo\n'
- f' {range_laden:.2f} LY current with cargo\n')
+ string += (f'Range : {range_unladen:.2f} LY unladen\n'
+ f' {range_laden:.2f} LY laden\n')
except Exception:
if __debug__:
diff --git a/modules.json b/modules.json
index 16e72f7f..b19441d4 100644
--- a/modules.json
+++ b/modules.json
@@ -1765,6 +1765,216 @@
"int_hullreinforcement_size5_class2": {
"mass": 16
},
+ "int_hyperdrive_overcharge_size2_class1": {
+ "mass": 2.5,
+ "optmass": 60,
+ "maxfuel": 0.6,
+ "fuelmul": 0.008,
+ "fuelpower": 2
+ },
+ "int_hyperdrive_overcharge_size2_class2": {
+ "mass": 2.5,
+ "optmass": 90,
+ "maxfuel": 0.9,
+ "fuelmul": 0.012,
+ "fuelpower": 2
+ },
+ "int_hyperdrive_overcharge_size2_class3": {
+ "mass": 2.5,
+ "optmass": 90,
+ "maxfuel": 0.9,
+ "fuelmul": 0.012,
+ "fuelpower": 2
+ },
+ "int_hyperdrive_overcharge_size2_class4": {
+ "mass": 2.5,
+ "optmass": 90,
+ "maxfuel": 0.9,
+ "fuelmul": 0.012,
+ "fuelpower": 2
+ },
+ "int_hyperdrive_overcharge_size2_class5": {
+ "mass": 2.5,
+ "optmass": 100,
+ "maxfuel": 1,
+ "fuelmul": 0.013,
+ "fuelpower": 2
+ },
+ "int_hyperdrive_overcharge_size3_class1": {
+ "mass": 5,
+ "optmass": 100,
+ "maxfuel": 1.2,
+ "fuelmul": 0.008,
+ "fuelpower": 2.15
+ },
+ "int_hyperdrive_overcharge_size3_class2": {
+ "mass": 2,
+ "optmass": 150,
+ "maxfuel": 1.8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.15
+ },
+ "int_hyperdrive_overcharge_size3_class3": {
+ "mass": 5,
+ "optmass": 150,
+ "maxfuel": 1.8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.15
+ },
+ "int_hyperdrive_overcharge_size3_class4": {
+ "mass": 5,
+ "optmass": 150,
+ "maxfuel": 1.8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.15
+ },
+ "int_hyperdrive_overcharge_size3_class5": {
+ "mass": 5,
+ "optmass": 167,
+ "maxfuel": 1.9,
+ "fuelmul": 0.013,
+ "fuelpower": 2.15
+ },
+ "int_hyperdrive_overcharge_size4_class1": {
+ "mass": 10,
+ "optmass": 350,
+ "maxfuel": 2,
+ "fuelmul": 0.008,
+ "fuelpower": 2.3
+ },
+ "int_hyperdrive_overcharge_size4_class2": {
+ "mass": 4,
+ "optmass": 525,
+ "maxfuel": 3,
+ "fuelmul": 0.012,
+ "fuelpower": 2.3
+ },
+ "int_hyperdrive_overcharge_size4_class3": {
+ "mass": 10,
+ "optmass": 525,
+ "maxfuel": 3,
+ "fuelmul": 0.012,
+ "fuelpower": 2.3
+ },
+ "int_hyperdrive_overcharge_size4_class4": {
+ "mass": 10,
+ "optmass": 525,
+ "maxfuel": 3,
+ "fuelmul": 0.012,
+ "fuelpower": 2.3
+ },
+ "int_hyperdrive_overcharge_size4_class5": {
+ "mass": 10,
+ "optmass": 585,
+ "maxfuel": 3.2,
+ "fuelmul": 0.013,
+ "fuelpower": 2.3
+ },
+ "int_hyperdrive_overcharge_size5_class1": {
+ "mass": 20,
+ "optmass": 700,
+ "maxfuel": 3.3,
+ "fuelmul": 0.008,
+ "fuelpower": 2.45
+ },
+ "int_hyperdrive_overcharge_size5_class2": {
+ "mass": 8,
+ "optmass": 1050,
+ "maxfuel": 5,
+ "fuelmul": 0.012,
+ "fuelpower": 2.45
+ },
+ "int_hyperdrive_overcharge_size5_class3": {
+ "mass": 20,
+ "optmass": 1050,
+ "maxfuel": 5,
+ "fuelmul": 0.012,
+ "fuelpower": 2.45
+ },
+ "int_hyperdrive_overcharge_size5_class4": {
+ "mass": 20,
+ "optmass": 1050,
+ "maxfuel": 5,
+ "fuelmul": 0.012,
+ "fuelpower": 2.45
+ },
+ "int_hyperdrive_overcharge_size5_class5": {
+ "mass": 20,
+ "optmass": 1175,
+ "maxfuel": 5.2,
+ "fuelmul": 0.013,
+ "fuelpower": 2.45
+ },
+ "int_hyperdrive_overcharge_size6_class1": {
+ "mass": 40,
+ "optmass": 1200,
+ "maxfuel": 5.3,
+ "fuelmul": 0.008,
+ "fuelpower": 2.6
+ },
+ "int_hyperdrive_overcharge_size6_class2": {
+ "mass": 16,
+ "optmass": 1800,
+ "maxfuel": 8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.6
+ },
+ "int_hyperdrive_overcharge_size6_class3": {
+ "mass": 40,
+ "optmass": 1800,
+ "maxfuel": 8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.6
+ },
+ "int_hyperdrive_overcharge_size6_class4": {
+ "mass": 40,
+ "optmass": 1800,
+ "maxfuel": 8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.6
+ },
+ "int_hyperdrive_overcharge_size6_class5": {
+ "mass": 40,
+ "optmass": 2000,
+ "maxfuel": 8.3,
+ "fuelmul": 0.013,
+ "fuelpower": 2.6
+ },
+ "int_hyperdrive_overcharge_size7_class1": {
+ "mass": 80,
+ "optmass": 1800,
+ "maxfuel": 8.5,
+ "fuelmul": 0.008,
+ "fuelpower": 2.75
+ },
+ "int_hyperdrive_overcharge_size7_class2": {
+ "mass": 32,
+ "optmass": 2700,
+ "maxfuel": 12.8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.75
+ },
+ "int_hyperdrive_overcharge_size7_class3": {
+ "mass": 80,
+ "optmass": 2700,
+ "maxfuel": 12.8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.75
+ },
+ "int_hyperdrive_overcharge_size7_class4": {
+ "mass": 80,
+ "optmass": 2700,
+ "maxfuel": 12.8,
+ "fuelmul": 0.012,
+ "fuelpower": 2.75
+ },
+ "int_hyperdrive_overcharge_size7_class5": {
+ "mass": 80,
+ "optmass": 3000,
+ "maxfuel": 13.1,
+ "fuelmul": 0.013,
+ "fuelpower": 2.75
+ },
"int_hyperdrive_size2_class1": {
"mass": 2.5,
"optmass": 48,
From 6ffcd91de5fd95c496b273ded83061a42b82eda6 Mon Sep 17 00:00:00 2001
From: David Sangrey <rixxan@hullseals.space>
Date: Fri, 10 May 2024 17:49:13 -0400
Subject: [PATCH 2/3] [2228] Add PyMkII Armor Details
From upcoming Coriolis data
---
modules.json | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/modules.json b/modules.json
index b19441d4..e9e444d6 100644
--- a/modules.json
+++ b/modules.json
@@ -3363,6 +3363,21 @@
"python_armour_reactive": {
"mass": 53
},
+ "python_nx_armour_grade1": {
+ "mass": 0
+ },
+ "python_nx_armour_grade2": {
+ "mass": 26
+ },
+ "python_nx_armour_grade3": {
+ "mass": 53
+ },
+ "python_nx_armour_mirrored": {
+ "mass": 53
+ },
+ "python_nx_armour_reactive": {
+ "mass": 53
+ },
"sidewinder_armour_grade1": {
"mass": 0
},
From 6032e5202d74d30cc187e467fd1cbc49e6e5f2a4 Mon Sep 17 00:00:00 2001
From: David Sangrey <rixxan@hullseals.space>
Date: Sat, 11 May 2024 17:58:39 -0400
Subject: [PATCH 3/3] [RELEASE] 5.10.6
---
ChangeLog.md | 29 +++++++++++++++++++++++++++++
config/__init__.py | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 324d1f8d..1dc357f1 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -6,6 +6,27 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are
in the source (not distributed with the Windows installer) for the
currently used version.
---
+Release 5.10.6
+===
+This release contains the data information for the new SCO modules added in Elite update 18.04.
+This should represent full support for the new Python Mk II.
+
+We now sign our code! This does mean that built EXEs are now slightly modified on our developer's machines.
+For information on what this means, and opt-out options, please visit https://github.com/EDCD/EDMarketConnector/wiki/Code-Signing-and-EDMC
+
+**Changes and Enhancements**
+* Added new SCO Module Details
+* Reverted a change from the prior release due to breaking some consumers.
+**Plugin Developers**
+* modules.p and ships.p are deprecated, and slated for removal in 5.11+!
+* The `openurl()` function in ttkHyperlinkLabel has been deprecated,
+and slated for removal in 5.11+! Please migrate to `webbrowser.open()`.
+
+**Plugin Developers**
+* modules.p and ships.p are deprecated, and slated for removal in 5.11+!
+* The `openurl()` function in ttkHyperlinkLabel has been deprecated,
+and slated for removal in 5.11+! Please migrate to `webbrowser.open()`.
+
Release 5.10.5
===
This release contains a fix for a bug that could crash EDMC's console versions when reading outfitting information
@@ -14,6 +35,9 @@ from the new SCO Frame Shift Drive modules.
Please note that this does not offer full support for the new SCO modules or the Python Mk II. More support will
be added in a future update.
+We now sign our code! This does mean that built EXEs are now slightly modified on our developer's machines.
+For information on what this means, and opt-out options, please visit https://github.com/EDCD/EDMarketConnector/wiki/Code-Signing-and-EDMC
+
**Changes and Enhancements**
* Updated Translations
* Added limited data regarding the Python Mk II
@@ -24,6 +48,11 @@ be added in a future update.
* Fixed a bug where the new SCO modules would display as a normal Frame Shift Drive
* Fixed a bug which could crash EDMC if the exact details of a Frame Shift Drive were unknown
+**Plugin Developers**
+* modules.p and ships.p are deprecated, and slated for removal in 5.11+!
+* The `openurl()` function in ttkHyperlinkLabel has been deprecated,
+and slated for removal in 5.11+! Please migrate to `webbrowser.open()`.
+
Release 5.10.4
===
This release contains updated dependencies, modules files, translations, and adds two new EDDN schemas. It also
diff --git a/config/__init__.py b/config/__init__.py
index a4a1e200..7e81d968 100644
--- a/config/__init__.py
+++ b/config/__init__.py
@@ -53,7 +53,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 = '5.10.5'
+_static_appversion = '5.10.6'
_cached_version: semantic_version.Version | None = None
copyright = '© 2015-2019 Jonathan Harris, 2020-2024 EDCD'