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

releaseApril2016.py

so many pep8 fixes

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

releaseCarnyx.py

Add Carnyx tiericide module upgrade/import paths

2015-06-02 23:27:08 +03:00

releaseDecember15.py

so many pep8 fixes

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

releaseFeb2016.py

so many pep8 fixes

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

releaseJan2016.py

so many pep8 fixes

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

releaseMar2016.py

Bunch of pep8 and inspection cleanup

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

releaseNov2016.py

Conversion mappings

2016-11-22 20:36:52 -05:00

releaseOceanus.py

Fixed old variable name in docstring

2014-11-07 23:40:58 -05:00

releaseParallax.py

Add item renames

2015-11-02 21:06:54 -05:00

releaseProteus.py

Conversion pack for Proteus Module Tiericide + conversion helper script

2015-01-13 22:37:20 -05:00

releaseTiamat.py

Update 862583 sans database

2015-02-14 01:27:52 -05:00

skinnedShips.py

Fix errors caused by importing a few "skinned" ships. Patch by ebag. See #1231

2017-07-09 19:08:06 -04:00