blitzman e7aceb6a8b Bringing branch up to date with dev ...

Merge branch 'development' into ErrorDialog_and_miscfixes

Conflicts:
	eos/saveddata/fit.py
	pyfa.py

2017-03-25 22:30:18 -04:00

..

__init__.py

Set files to 644 besides pyfa.py and scripts

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

booster.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

cargo.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

character.py

Merge branch 'development' into LogBook_v2

2017-02-25 18:21:07 -05:00

citadel.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

crestchar.py

Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later.

2017-02-09 09:36:16 -08:00

damagePattern.py

Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later.

2017-02-09 09:36:16 -08:00

drone.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

fighter.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

fighterAbility.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

fit.py

Fix tox things.

2017-03-24 11:14:34 -07:00

implant.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

implantSet.py

Fix a bunch of calls to functions that pass the wrong type of parameter, the wrong number, etc.

2017-02-08 22:20:56 -08: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

Fix for #1060

2017-03-19 16:27:41 -04:00

override.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

price.py

Reformatting eos.saveddata

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

ship.py

Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers

2017-02-11 11:51:53 -08:00

targetResists.py

Improve handling for exceptions, output more information so we can find and fix problems.

2017-02-12 13:09:26 -08:00

user.py

Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.

2017-02-10 11:50:04 -08:00