blitzmann e19d231eba Merge branch 'master' into v2.2.0b1 ...

# Conflicts:
#	eve.db

2018-06-12 21:41:04 -04:00

..

conversions

Merge branch 'master' into test-3

2018-02-14 22:07:33 -05:00

jargon

Tweak jargon defaults for more entries based on personal experience

2018-05-30 15:31:12 -04:00

marketSources

Get back into tox's good graces

2018-05-15 01:41:32 -04: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

attribute.py

py2to3 automatic conversion. Woot!

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

character.py

Get back into tox's good graces

2018-05-15 01:41:32 -04:00

crudeTests.py

Fix energy warfare

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

damagePattern.py

Merge remote-tracking branch 'origin/master' into test-3

2018-02-24 02:03:29 -05:00

esi.py

Add status messages back to ESI fitting export (#1502)

2018-05-21 23:37:15 -04:00

esiAccess.py

Reduce code duplication:

2018-05-15 22:13:04 +03:00

eveapi.py

Merge branch 'test-3' into esi

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

fit.py

Merge branch 'master' into v2.2.0b1

2018-06-12 21:41:04 -04:00

implantSet.py

Make modules static if they do not use self.

2017-02-09 00:04:41 -08:00

market.py

Merge branch 'singularity'

2018-05-30 19:49:40 -04:00

network.py

Reduce code duplication:

2018-05-15 22:13:04 +03:00

port.py

Do not allow import of unpublished items (temporary measure to prevent abyssal items)

2018-05-29 21:01:55 -04:00

prefetch.py

Add additional logging to services

2017-02-28 10:32:03 -08:00

prereqsCheck.py

code cleanup

2017-11-27 21:05:06 -05:00

price.py

replace eve-central with evemarketer

2018-05-07 22:28:40 -04:00

server.py

tox

2018-05-20 15:55:26 -04:00

settings.py

Reduce code duplication:

2018-05-15 22:13:04 +03:00

targetResists.py

Do the same treatment to Target Resists as Damage Patterns

2018-02-24 02:01:23 -05:00

update.py

Get back into tox's good graces

2018-05-15 01:41:32 -04:00