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

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

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

booster.py

cleanup

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

cargo.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

character.py

Implement hard constraints for All 5/0 characters with respect to skills and sec status

2017-05-08 19:47:55 -04:00

crest.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

damagePattern.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

databaseRepair.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

drone.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

fighter.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

fit.py

flake8 fixes

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

implant.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

implantSet.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

loadDefaultDatabaseValues.py

Convert old style classes to new

2017-02-08 23:06:39 -08:00

miscData.py

Burn types with fire

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

module.py

flake8 fixes

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

override.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

price.py

Don't return None as a price, always return a float (#1291) (#1292)

2017-09-21 21:13:05 -04:00

queries.py

py2to3 automatic conversion. Woot!

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

skill.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

targetResists.py

Change func.now() to datetime.datetime.now().

2017-05-07 11:35:26 -04:00

user.py

Burn types with fire

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