Merge remote-tracking branch 'origin/main' into sprint-38/server

Browse Source

# Conflicts:
#	CHANGELOG.md
#	server/data/systems.db
#	tooling/check-systems-db-stamp
#	tooling/economy-db/import_economics.py
#	tooling/planet-gen/generate_atlas.py

...

This commit is contained in:

jpmschweitzer

2026-05-03 09:30:48 +02:00

parent 6582ee4cca 29479da17c

commit 64a873fc1a

30 changed files with 429 additions and 99 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

server/data/systems.db

BIN

Binary file not shown.