blitzmann 3fd4d106d9 Merge branch 'master' into test-3 ...

# Conflicts:
#	config.py
#	eos/effects/warpdisruptsphere.py
#	service/update.py

2018-03-25 13:16:07 -04:00

..

gui

use a different image to denote changed skills

2017-11-16 01:31:28 -05:00

icons

update effect headers, add some icons, update DB to final 1248987

2018-02-14 22:05:55 -05:00

renders

Update effects, icons, db, version bump

2018-03-25 13:11:29 -04:00