Merge remote-tracking branch 'upstream/main' into core-rb2

Browse Source

# Conflicts:
#	CHANGELOG.md
#	build/vite.js
#	scripts/package-boundaries.json
#	server/standalone/vite.config.js
#	src/app/scene.js
#	src/layers/vessels/queries.js
#	src/standalone/application.js
#	src/tooling/viteBuild.test.mjs
#	src/ui/cockpitInstruments.js
#	src/ui/layerPanel.js
#	src/ui/panelPositionControls.js

...

This commit is contained in:

Meir Michanie committed 2026-10-10 23:15:54 +02:00

2 parents 41378656c6 591f299d11

commit 71f7a58169

475 files changed

+67826 -4965

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

No files matched your search

scripts/package-boundaries.json

+1297 -1285

File diff suppressed because it is too large. Load diff