forked from 1b-agent/opencadstudio-upstream
Afonsop
55e3a6a9e2
Conflicts resolved as unions of behavior wherever possible: - #1350 (set_properties numeric CAS): kept our stricter json_values_match (guards u64>f64 precision loss); upstream's duplicate removed. - #1351 (web open-from-bytes): our implementation wins (guarded queue, settle semantics, protocol 2) using upstream's validation helper so both sides' tests pass. - #1358/#1359 (Windows printer routing/media): merged both engines — upstream's route planning, media tables, GDI raster path and driver options on top of our level-2 enumeration fallback, true-default resolution, quoted printto params, existence probe, and error descriptions. - #1360 (plot-style leniency): decompress_ctb now carries both our CTBVER1/STBVER1 container tags and structured flag, and upstream's lenient reader with Windows-1252 handling. - 3D snapping precedence: upstream's F4 3D osnap system takes precedence over our #1030 solid edge wires when the mesh cache has geometry edges; our wires remain the fallback for triangle-only caches and mesh entities (both test suites pass). - Fixed upstream-side bugs surfaced by the merge: parametric arc grips impl/test contradiction, psetupin test path separators, and our pdf_raster regression where the new dpi argument was threaded but ignored (GDI 300-DPI would have cached at 150). - ocs_save repinned to the upstream acadrust rev; docs/command- reference.md regenerated (the staleness test caught it).
