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

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

2017-02-07 19:22:26 -05:00

..

conversions

Fix conversion imports for osx deprecated... :(

2017-01-27 22:06:52 -05:00

pycrest

Tox fixes

2017-02-05 15:39:07 -08:00

__init__.py

Make it run again

2016-12-02 03:13:54 -08:00

attribute.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

character.py

Tox fixes

2017-02-05 15:39:07 -08:00

crest.py

Burn types with fire

2017-01-09 22:36:19 -08:00

crudeTests.py

Fix energy warfare

2016-06-19 23:04:52 -04:00

damagePattern.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

eveapi.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

fit.py

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

2017-02-07 19:22:26 -05:00

implantSet.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

market.py

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

2017-02-07 19:22:26 -05:00

network.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

port.py

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

2017-02-07 19:22:26 -05:00

prefetch.py

Change from UPDATE to DELETE for null damage pattern and target resist names

2017-01-29 19:04:57 -05:00

price.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

server.py

Bunch of pep8 and inspection cleanup

2016-12-15 12:43:19 -08:00

settings.py

oh god this isn't gonna work

2017-01-23 21:06:12 -05:00

targetResists.py

Large pep8 compliance to make work for Tox

2016-12-13 21:23:01 -08:00

update.py

Merge branch 'master' into development

2017-01-29 15:02:22 -05:00