blitzmann b30b3fcbf1 Merge branch 'master' into test-3 ...

Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py

2017-11-23 11:19:05 -05:00

..

__init__.py

Fix dirty skill indicator (* instead of blue text). Need to get a different icon working for those. Remove debugging prints()

2017-11-16 01:20:38 -05:00

upgrade1.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

upgrade2.py

bajillion pep8 fixes to pass tox

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

upgrade3.py

bajillion pep8 fixes to pass tox

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

upgrade4.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

upgrade5.py

bajillion pep8 fixes to pass tox

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

upgrade6.py

Do not assume number of columns for damagePatterns, see #1238

2017-07-10 22:46:30 -04:00

upgrade7.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

upgrade8.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

upgrade9.py

General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out

2017-04-05 15:47:19 -07:00

upgrade10.py

bajillion pep8 fixes to pass tox

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

upgrade11.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

upgrade12.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

upgrade13.py

bajillion pep8 fixes to pass tox

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

upgrade14.py

bajillion pep8 fixes to pass tox

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

upgrade15.py

Fix commit message. LOTS of fixes for flake8.

2017-02-08 14:22:56 -08:00

upgrade16.py

bajillion pep8 fixes to pass tox

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

upgrade17.py

Update some migrations to consider new schema (#1185)

2017-05-20 02:44:26 -04:00

upgrade18.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

upgrade19.py

Fix commit message. LOTS of fixes for flake8.

2017-02-08 14:22:56 -08:00

upgrade20.py

fix

2017-01-27 23:35:19 -05:00

upgrade21.py

Tox fixes, because it's a thing we do now

2017-02-16 23:12:25 -05:00

upgrade22.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

upgrade23.py

flake8 fixes

2017-05-08 21:32:13 -04:00

upgrade24.py

Add option to ignore fitting restrictions on a per-fit basis

2017-04-18 23:57:34 -04:00

upgrade25.py

cleanup

2017-07-11 02:30:26 -04:00

upgrade26.py

cleanup

2017-07-11 02:06:09 -04:00