grom, with the measurement in front of him: full swap, drop the extras. Our
five water files go, so does water_fx/bob.rs (the swimmer bob, which read the
vertex swell that goes with them) and the Water Quality dropdown; his Improved
Water checkbox and its two CVars come in; the Ironforge magma palette and our
shader hooks are re-applied onto his liquid.wgsl.
Also records where the three delete/modify files land -- his cvars rows into our
own REGISTERED table, and his PANE_LAYER_BASE rule into UNIT_PANE_LAYER_BASE,
which matters: his seam claims render layers 30 and 31 and our booth ladder
grows upward with nothing stopping it reaching them.
Three of the 34 conflicts resolved (ours: .gitignore, README, the input-wall
cover -- his side there is his own workflow and upstream drift past our squash
base, not water). The other 31 are open; scripts/water-port-merge.sh rebuilds
the mid-merge tree in a couple of minutes.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SgstFWtn1RxEJ5kVrpgYwn
gromandClaude Opus 5
055fc7baeb