Ryan Holmes 25182de365 Merge branch 'master' into development ...

Conflicts:
	gui/builtinViewColumns/baseName.py

2017-02-08 13:58:37 -05:00

..

__init__.py

Removed actual fleet files. Cleaned up __init__.py that had references.

2016-12-14 10:20:20 -08:00

booster.py

Burn types with fire

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

cargo.py

Burn types with fire

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

character.py

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

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

crest.py

Burn types with fire

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

damagePattern.py

Burn types with fire

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

databaseRepair.py

Fix emAmount > {type}Amount, some formatting tweaks

2017-02-08 09:41:59 -05:00

drone.py

Burn types with fire

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

fighter.py

Burn types with fire

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

fit.py

Burn types with fire

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

implant.py

Burn types with fire

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

implantSet.py

Burn types with fire

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

loadDefaultDatabaseValues.py

bajillion pep8 fixes to pass tox

2016-12-13 23:31:39 -08:00

miscData.py

Burn types with fire

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

module.py

Burn types with fire

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

override.py

Burn types with fire

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

price.py

Burn types with fire

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

queries.py

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

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

skill.py

Burn types with fire

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

targetResists.py

Burn types with fire

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

user.py

Burn types with fire

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