blitzman 5d46fe7e4d Merge branch 'master' into development ...

Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py

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

..

__init__.py

Set files to 644 besides pyfa.py and scripts

2014-07-30 21:23:27 -04:00

booster.py

bajillion pep8 fixes to pass tox

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

cargo.py

Max out cargo amount to sys.maxint (#958)

2017-01-28 13:31:03 -05:00

character.py

GUI implementation of alpha clone switching

2016-12-11 22:51:48 -05:00

citadel.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

crestchar.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

damagePattern.py

Revert "Create variables before they are referenced. "

2016-11-04 14:18:18 -07:00

drone.py

Make Effects Togglable

2016-11-21 22:02:16 -08:00

fighter.py

oh god this isn't gonna work

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

fighterAbility.py

bajillion pep8 fixes to pass tox

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

fit.py

oh god this isn't gonna work

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

implant.py

Make Effects Togglable

2016-11-21 22:02:16 -08:00

implantSet.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

miscData.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

mode.py

Clean up new tactical mode stats stuff

2016-12-14 12:21:00 -08:00

module.py

oh god this isn't gonna work

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

override.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

price.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

ship.py

Make Effects Togglable

2016-11-21 22:02:16 -08:00

targetResists.py

bajillion pep8 fixes to pass tox

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

user.py

more PEP8 cleanup

2016-10-19 12:26:03 -07:00