Skip to content
This repository has been archived by the owner on Apr 19, 2022. It is now read-only.

Commit

Permalink
Merge pull request #335 from mrmin123/staging
Browse files Browse the repository at this point in the history
7.1.1 to master
  • Loading branch information
mrmin123 authored Dec 28, 2018
2 parents c21b7b4 + 9970f03 commit 998be79
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#### 7.1.1

* Bugfix to config readers

#### 7.1.0

* Major housekeeping release
Expand Down
2 changes: 1 addition & 1 deletion docs/bundle.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions kcauto.sikuli/config.sikuli/config_fleet_switcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ def parse_cfg(self):
self.config['enabled'] = False
return

self.config['enabled'] = True

return self.config

@staticmethod
def validate_cfg(config):
"""Method to validate the FleetSwitcher settings.
Expand Down
1 change: 1 addition & 0 deletions kcauto.sikuli/config.sikuli/config_ship_switcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ def parse_cfg(self):
self.config['enabled'] = False
return self.config

self.config['enabled'] = True
for slot in range(0, 6):
criteria = self._getlist(
cp, 'ShipSwitcher', 'Slot{}Criteria'.format(slot + 1))
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kcauto",
"version": "7.1.0",
"version": "7.1.1",
"main": "index.js",
"repository": "git@gitlab.com:mrmin123/kcauto.git",
"author": "mrmin123 <minyoung.choi@gmail.com>",
Expand Down

0 comments on commit 998be79

Please sign in to comment.