blitzmann 03212be54a Merge branch 'master' into test-3 ...

# Conflicts:
#	eos/capSim.py
#	eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
#	eos/effects/warpdisruptsphere.py

2018-03-25 03:03:59 -04:00

..

__init__.py

Set files to 644 besides pyfa.py and scripts

2014-07-30 21:23:27 -04:00

booster.py

Merge branch 'master' into test-3

2017-11-23 11:19:05 -05:00

boosterSideEffect.py

fix for boosters

2017-11-23 20:51:03 -05:00

cargo.py

py2to3 automatic conversion. Woot!

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

character.py

Merge branch 'master' into test-3

2018-03-25 03:03:59 -04:00

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

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

damagePattern.py

Fix importing damage profiles which included overwriting existing ones and then performing a delete on one of them. #1416

2018-02-24 01:49:09 -05:00

drone.py

Fix for #1383. Due to the changed mechanics of None in py3, getModifiedItemAttr was defaulted to 0 instead of None. This adds an explicit default of None when trying to find the allowed drone group attribute

2018-02-17 10:53:29 -05:00

fighter.py

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

2018-02-17 12:31:58 -05:00

fighterAbility.py

py2to3 automatic conversion. Woot!

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

fit.py

Merge branch 'master' into test-3

2018-03-25 03:03:59 -04:00

implant.py

py2to3 automatic conversion. Woot!

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

implantSet.py

Fix implant set copy (#1236)

2017-07-10 00:21:52 -04:00

miscData.py

Reformatting eos.saveddata

2016-10-19 11:42:45 -07:00

mode.py

py2to3 automatic conversion. Woot!

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

module.py

Merge branch 'master' into test-3

2018-03-25 03:03:59 -04:00

override.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

price.py

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

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

ship.py

py2to3 automatic conversion. Woot!

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

targetResists.py

Do the same treatment to Target Resists as Damage Patterns

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

user.py

py2to3 automatic conversion. Woot!

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