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 |
|
Ryan Holmes
|
3b546de070
|
More deprecated fixes, and re-enable a working stats view
|
2017-06-14 03:51:40 -04:00 |
|
Ryan Holmes
|
8e4db5a8c3
|
Do some renaming of some files
|
2017-06-12 18:08:07 -04:00 |
|
petosorus
|
2c98baade8
|
Price options labels + total computing in minimal
|
2017-05-29 15:24:21 +02:00 |
|
petosorus
|
1781c6dcf0
|
total computation + settings
|
2017-05-24 16:27:32 +02:00 |
|
blitzmann
|
fbf455c9fe
|
Fix for fighter prices (#1178)
|
2017-05-18 22:28:09 -04:00 |
|
Ebag333
|
994bd72409
|
Rework pricing.
|
2017-04-05 14:40:27 -07:00 |
|