ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-04 01:21:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge tag 'release/4.1.2' into releases

Browse Source 
Release 4.1.2
This commit is contained in:
Athanasius 2020-10-07 10:25:27 +01:00
commit b87ed70edb
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog.md
View File

@ -1,6 +1,12 @@
This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first). 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 Release 4.1.1
=== ===

2
EDMC.py
View File

@ -300,7 +300,7 @@ sys.path: {sys.path}'''
sys.exit(EXIT_LAGGING) sys.exit(EXIT_LAGGING)
# Ignore possibly missing shipyard info # 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") logger.error("No commodities or outfitting (modules) in CAPI data")
return return

2
config.py
View File

@ -13,7 +13,7 @@ appcmdname = 'EDMC'
# appversion **MUST** follow Semantic Versioning rules: # appversion **MUST** follow Semantic Versioning rules:
# <https://semver.org/#semantic-versioning-specification-semver> # <https://semver.org/#semantic-versioning-specification-semver>
# Major.Minor.Patch(-prerelease)(+buildmetadata) # 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 # For some things we want appversion without (possible) +build metadata
appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease')) appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease'))
copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD' copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'

12
edmarketconnector.xml
View File

@ -173,6 +173,12 @@
<![CDATA[ <![CDATA[
<style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style> <style>body { font-family:"Segoe UI","Tahoma"; font-size: 75%; } h2 { font-family:"Segoe UI","Tahoma"; font-size: 105%; }</style>
<h2>Release 4.1.2</h2>
<ul>
<li>Minor fix to EDMC.py to revert broken logic trying to detect when there is
neither commodities nor outfitting data for a station.</li>
</ul>
<h2>Release 4.1.1</h2> <h2>Release 4.1.1</h2>
<p>This release should get the program running again for everyone who had issues <p>This release should get the program running again for everyone who had issues
with 4.1.0.</p> with 4.1.0.</p>
@ -787,11 +793,11 @@ If any of your plugins are listed in that section then they will need updating,
]]> ]]>
</description> </description>
<enclosure <enclosure
url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.1.1/EDMarketConnector_win_4.1.1.msi" url="https://github.com/EDCD/EDMarketConnector/releases/download/Release/4.1.2/EDMarketConnector_win_4.1.2.msi"
sparkle:os="windows" sparkle:os="windows"
sparkle:installerArguments="/passive LAUNCH=yes" sparkle:installerArguments="/passive LAUNCH=yes"
sparkle:version="4.1.1" sparkle:version="4.1.2"
length="11354112" length="11362304"
type="application/octet-stream" type="application/octet-stream"
/> />
</item> </item>