blitzmann c0f8099f49 Merge branch 'master' into i18n ...

# Conflicts:
#	staticdata/fsd_binary/typedogma.json
#	staticdata/fsd_lite/evetypes.json
#	staticdata/phobos/metadata.0.json
#	staticdata/phobos/traits.json

2020-08-02 18:54:31 -04:00

..

dogmaattributes.0.json

update data

2020-07-19 21:33:35 -04:00

dogmaeffects.0.json

Merge branch 'master' into i18n

2020-08-02 18:54:31 -04:00

dogmaunits.0.json

Remove LSF, convert staticdata files to split files

2020-06-27 22:27:28 -04:00

dynamicitemattributes.0.json

Remove LSF, convert staticdata files to split files

2020-06-27 22:27:28 -04:00

marketgroups.0.json

update data

2020-07-19 21:33:35 -04:00

metagroups.0.json

Remove LSF, convert staticdata files to split files

2020-06-27 22:27:28 -04:00

requiredskillsfortypes.0.json

Merge branch 'master' into i18n

2020-08-02 18:54:31 -04:00

requiredskillsfortypes.1.json

update data

2020-07-19 21:33:35 -04:00

typedogma.0.json

update data

2020-07-19 21:33:35 -04:00

typedogma.1.json

update data

2020-07-19 21:33:35 -04:00

typedogma.2.json

update data

2020-07-19 21:33:35 -04:00

typedogma.3.json

update data

2020-07-19 21:33:35 -04:00

typedogma.4.json

update data

2020-07-19 21:33:35 -04:00