dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Merge branch 'master' into singularity

Browse Source
This commit is contained in:
blitzmann
2014-11-29 21:53:22 -05:00
parent 88ee1d60be 9a8642e789
commit 7100e8997b
21 changed files with 976 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/market.py
View File

@@ -32,7 +32,7 @@ import service.conversions as conversions
try:
from collections import OrderedDict
except ImportError:
from gui.utils.compat import OrderedDict
from utils.compat import OrderedDict
# Event which tells threads dependent on Market that it's initialized
mktRdy = threading.Event()

2
service/port.py
View File

@@ -27,7 +27,7 @@ import service
try:
from collections import OrderedDict
except ImportError:
from gui.utils.compat import OrderedDict
from utils.compat import OrderedDict
FIT_WIN_HEADINGS = ["High power", "Medium power", "Low power", "Rig Slot", "Sub System", "Charges"]
EFT_SLOT_ORDER = [Slot.LOW, Slot.MED, Slot.HIGH, Slot.RIG, Slot.SUBSYSTEM]