DarkPhoenix 977cf61ff5 Merge branch 'master' into singularity ...

# Conflicts:
#	eos/effects.py
#	staticdata/fsd_built/dogmaeffects.0.json
#	staticdata/fsd_built/iconids.0.json
#	staticdata/fsd_built/marketgroups.0.json
#	staticdata/fsd_built/types.4.json
#	staticdata/fsd_built/types.5.json
#	staticdata/phobos/metadata.0.json
#	version.yml

2025-11-14 22:13:20 +01:00

..

metadata.0.json

Update static data

2025-10-28 15:53:35 +01:00

traits.0.json

Merge branch 'master' into singularity

2025-11-14 22:13:20 +01:00