Skip to content

Commit

Permalink
Increment version numbers and update README
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonylangsworth committed Jan 12, 2022
1 parent 0c7e6ab commit c22b1ce
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ To remove or uninstall:
1. Start EDMC. If you start EDMC while **Elite: Dangerous** is running, the plug-in may miss important events.
2. (Optional) Go to the "File" -> "Settings" menu, navigate to the "Minor Faction Activity Tracker" tab and select the minor faction(s) you want to support or undermine from the list. If they do not appear in the list, travel to a system where the faction is present then reopen the Settings dialog. EDMFAT saves the selected minor factions when EDMC shuts down and so only needs to be done once. EDMFAT does not save the list of minor factions.
3. Play **Elite: Dangerous**, supporting or undermining your minor faction(s).
4. EDMFAT captures minor faction-relevant activity in the main EDMC window. EDMFAT tracks [completing missions](doc/missions.md), selling bounty vouchers (but not interstellar factors or carriers), selling combat bonds (including interstellar factors and carriers), trade (positive, negative and black market), selling cartography data, selling organic data, failed missions and clean ship kills. EDMFAT cannot track conflict zone wins and losses due to **Elite: Dangerous** limitations.
4. EDMFAT captures minor faction-relevant activity in the main EDMC window. EDMFAT tracks [completing missions](doc/missions.md), selling bounty vouchers (but not at interstellar factors), selling combat bonds (including at interstellar factors and carriers), trade (positive, negative and black market), selling cartography data, selling organic data, failed missions and clean ship kills. EDMFAT cannot track conflict zone wins and losses due to **Elite: Dangerous** limitations.
5. (Optional) Change the minor faction(s) to support or undermine as per step 2. This can be done at any time. The plug-in recalculates any previous activity.
6. When done, press the `Copy` button to copy your activity to the Windows clipboard.
6. (Optional) Instead of pressing the `Copy` button, press the `Copy + Reset` button to copy your activity to the Windows clipboard and clear any activity. Do this at the end of a session when reporting activity.
Expand Down
2 changes: 1 addition & 1 deletion load.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
this.minor_factions = tk.StringVar()
this.activity_summary = tk.StringVar()
this.current_station = ""
this.version = (0,25,0)
this.version = (0,26,0)
this.logger = logging.getLogger(f'{appname}.{os.path.basename(os.path.dirname(__file__))}')
this.settings_file = os.path.join(os.path.dirname(sys.modules[__name__].__file__), "settings.json")
this.star_system_resolver = functools.partial(edmfat_web_services.resolve_star_system_via_edsm, this.logger)
Expand Down
4 changes: 2 additions & 2 deletions wix/edmfat.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<Package InstallerVersion="200" Compressed="yes" Comments="Windows Installer Package"/>
<Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
<Upgrade Id="530be369-3c3f-4eae-abf3-46fe6e7c0935">
<UpgradeVersion Minimum="0.25.0" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
<UpgradeVersion Minimum="0.0.0" Maximum="0.25.0" IncludeMinimum="yes" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED"/>
<UpgradeVersion Minimum="0.26.0" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
<UpgradeVersion Minimum="0.0.0" Maximum="0.26.0" IncludeMinimum="yes" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED"/>
</Upgrade>
<Condition Message="A newer version of this software is already installed.">NOT NEWERVERSIONDETECTED</Condition>
<Property Id="ALLUSERS" Value="2" Secure="yes" />
Expand Down

0 comments on commit c22b1ce

Please sign in to comment.