Brandon Thomas 93f4fe7314 Merge branch 'main' into worktree-agent-ad0c2eed1a8890262 ... # Conflicts: # crates/effects/Cargo.toml # crates/ui-egui/src/panels/mod.rs # docs/parity.md		2026-10-02 22:27:43 -04:00
..
src	Merge branch 'main' into worktree-agent-ad0c2eed1a8890262	2026-10-02 22:27:43 -04:00
Cargo.toml	Merge branch 'main' into worktree-agent-ad0c2eed1a8890262	2026-10-02 22:27:43 -04:00