diff --git a/ChangeLog.md b/ChangeLog.md index 4b8a0e31..7006a312 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,12 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first). --- +Release 4.1.2 +=== + +* Minor fix to EDMC.py to revert broken logic trying to detect when there is + neither commodities nor outfitting data for a station. + Release 4.1.1 === diff --git a/EDMC.py b/EDMC.py index db888f90..fac74186 100755 --- a/EDMC.py +++ b/EDMC.py @@ -300,7 +300,7 @@ sys.path: {sys.path}''' sys.exit(EXIT_LAGGING) # Ignore possibly missing shipyard info - elif not data['lastStarport'].get('commodities') or data['lastStarport'].get('modules'): + elif not (data['lastStarport'].get('commodities') or data['lastStarport'].get('modules')): logger.error("No commodities or outfitting (modules) in CAPI data") return diff --git a/config.py b/config.py index 0d859c4c..1f756baa 100644 --- a/config.py +++ b/config.py @@ -13,7 +13,7 @@ appcmdname = 'EDMC' # appversion **MUST** follow Semantic Versioning rules: # # Major.Minor.Patch(-prerelease)(+buildmetadata) -appversion = '4.1.1' #-rc1+a872b5f' +appversion = '4.1.2' #-rc1+a872b5f' # For some things we want appversion without (possible) +build metadata appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease')) copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD' diff --git a/edmarketconnector.xml b/edmarketconnector.xml index 3783a6d5..924f5d0a 100644 --- a/edmarketconnector.xml +++ b/edmarketconnector.xml @@ -173,6 +173,12 @@ body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; } +

Release 4.1.2

+ +

Release 4.1.1

This release should get the program running again for everyone who had issues with 4.1.0.

@@ -787,11 +793,11 @@ If any of your plugins are listed in that section then they will need updating, ]]>