thysson2701
|
0794e23b43
|
merge: integrate OrcaSlicer-ImageMap onto kx-v2.4.2 base
Rebuilds experimental/imagemap on the correct base. The previous attempt
merged onto upstream 8500fcdcca, which silently dropped all 13 KX commits
(branding, Gitea updater, Kobra X profile, AMS fixes) and reverted the
Moonraker AMS feature set.
Conflict resolution:
- KX side: branding assets, workflows, Kobra X profile, Gitea updater,
GUI_App declarations, PrintObject filament-id structure, GLCanvas3D
reload fixes, PresetBundle extruder validation, ZAA/Polyline3 in GCode.
- ImageMap side: texture/colour machinery (GCode texture sampling,
ToolOrdering zone resolution, MeshBoolean provenance, CGAL repair
colour remap, top-surface image fill params).
- Rewrote ImageMap's wall_filament/sparse_infill_filament/
solid_infill_filament accesses onto the KX *_filament_id options
instead of adding duplicate config fields.
|
2026-07-22 13:56:59 +02:00 |
|