DarkPhoenix 4ba948c6f9 Merge branch 'master' into ammo_graph ...

# Conflicts:
#	gui/builtinMarketBrowser/itemView.py
#	service/market.py

2020-02-04 01:43:52 +03:00

..

conversions

Add new and old but missing conversions

2020-01-28 14:58:54 +03:00

jargon

Add slave as jargon entry for amulets

2020-01-16 15:39:54 +03:00

marketSources

Do not use evepraisal info unless there are orders up

2019-11-04 02:50:55 +03:00

port

Make sure not to catch keyboard interrupts and system exits

2020-02-03 16:12:41 +03:00

pycrest

Merge branch 'test-3' into esi

2018-03-10 15:32:21 -05:00

__init__.py

Make it run again

2016-12-02 03:13:54 -08:00

ammo.py

Fix ammo section labels

2019-11-13 16:14:00 +03:00

attribute.py

Update graph info when fit name changes

2019-07-07 02:33:54 +03:00

character.py

Attempt to terminate threads when pyfa is closed

2020-02-03 17:12:23 +03:00

const.py

Show shield HP/EHP based on HP selection in main panel

2019-08-16 09:31:02 +03:00

crudeTests.py

Fix energy warfare

2016-06-19 23:04:52 -04:00

damagePattern.py

Fix crashes related to target profiles / damage patterns

2019-12-17 13:10:41 +03:00

esi.py

Change the way we handle dialogs

2019-08-09 20:09:31 +03:00

esiAccess.py

Update graph info when fit name changes

2019-07-07 02:33:54 +03:00

eveapi.py

Merge branch 'test-3' into esi

2018-03-10 15:32:21 -05:00

fit.py

Do not choke on fits for unknown ships

2019-10-25 01:00:32 +03:00

implantSet.py

Make sure not to catch keyboard interrupts and system exits

2020-02-03 16:12:41 +03:00

market.py

Merge branch 'master' into ammo_graph

2020-02-04 01:43:52 +03:00

network.py

Make sure not to catch keyboard interrupts and system exits

2020-02-03 16:12:41 +03:00

prefetch.py

Remove "database defaults"

2019-12-07 01:21:46 +03:00

prereqsCheck.py

Make sure not to catch keyboard interrupts and system exits

2020-02-03 16:12:41 +03:00

price.py

Attempt to terminate threads when pyfa is closed

2020-02-03 17:12:23 +03:00

server.py

Make sure not to catch keyboard interrupts and system exits

2020-02-03 16:12:41 +03:00

settings.py

Make sure not to catch keyboard interrupts and system exits

2020-02-03 16:12:41 +03:00

targetProfile.py

Fix crashes related to target profiles / damage patterns

2019-12-17 13:10:41 +03:00

update.py

Attempt to terminate threads when pyfa is closed

2020-02-03 17:12:23 +03:00