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

Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development

Browse Source 
Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py
This commit is contained in:
blitzman
2017-02-07 19:22:26 -05:00
parent ca311e5dec 3c31391ec9
commit f7d7b3fe5e
66 changed files with 137 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gui/itemStats.py
View File

@@ -28,7 +28,16 @@ import wx.html
import wx.lib.mixins.listctrl as listmix
import config
from eos.types import Fit, Ship, Citadel, Module, Skill, Booster, Implant, Drone, Mode, Fighter
from eos.saveddata.mode import Mode
from eos.saveddata.character import Skill
from eos.saveddata.implant import Implant
from eos.saveddata.booster import Booster
from eos.saveddata.drone import Drone
from eos.saveddata.fighter import Fighter
from eos.saveddata.module import Module
from eos.saveddata.ship import Ship
from eos.saveddata.citadel import Citadel
from eos.saveddata.fit import Fit
from service.market import Market
from service.attribute import Attribute
import gui.mainFrame