benmichael/gods-eye-view
1
0 Fork 0
mirror of https://github.com/bilawalsidhu/gods-eye-view.git synced 2026-11-06 03:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,896 Commits 31 Branches 5 Tags
08b8be26fe51a584a8af9d4ece219d1bab25f8d6
Commit Graph
3 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Van Horn 08b8be26fe Merge remote-tracking branch 'upstream/main' into fix/drone-airspace 
# Conflicts:
#	docs/CURRENT-STATE.md
#	src/app/constructCatalog.test.mjs
#	src/app/sourceComposition.test.mjs
#	src/data/layerState.test.mjs
#	src/data/layerStateTokenLedger.test.mjs
#	src/i18n/locales/ar.json
 2026-11-03 11:55:42 -08:00
Matt Van Horn 351a47ee22 Merge remote-tracking branch 'upstream/main' into fix/drone-airspace 
Resolve the CURRENT-STATE.md layer table by keeping main's realigned
table and adding this layer's row. Main added an Arabic locale, so
translate the 12 layer strings and list ar.json in the drone-airspace
package.
 2026-11-02 16:10:41 -08:00
Matt Van Horn c6a83b78df Merge remote-tracking branch 'upstream/main' into fix/drone-airspace 
Keep both sides at the end of the de, fr, it, ja, pt and zh-Hant locale
files, where main's scene authoring strings landed next to this layer's.
 2026-10-30 23:12:52 -07:00