Ryan Holmes 25182de365 Merge branch 'master' into development ...

Conflicts:
	gui/builtinViewColumns/baseName.py

2017-02-08 13:58:37 -05:00

..

__init__.py

Line endings again

2017-02-07 19:07:22 -05:00

abilities.py

Burn types with fire

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

ammo.py

.gitattributes fixing line endings

2017-02-05 15:39:23 -08:00

ammoIcon.py

.gitattributes fixing line endings

2017-02-05 15:39:23 -08:00

attributeDisplay.py

so many pep8 fixes

2016-12-13 20:16:44 -08:00

baseIcon.py

Burn types with fire

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

baseName.py

Merge branch 'master' into development

2017-02-08 13:58:37 -05:00

capacitorUse.py

.gitattributes fixing line endings

2017-02-05 15:39:23 -08:00

maxRange.py

Burn types with fire

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

misc.py

Fix syntax. Catch scenarios where none can be passed.

2017-01-29 10:12:16 -08:00

price.py

Burn types with fire

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

propertyDisplay.py

bajillion pep8 fixes to pass tox

2016-12-13 23:31:39 -08:00

state.py

Burn types with fire

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