Merge upstream main (Bambu H2C/A2L multi-nozzle support) into IMEX branch

Browse Source

Conflicts were all co-located additions rather than design collisions:
- GCode.cpp: adopt upstream's toolchange(filament_id, nozzle_id) signature and
  per-variant set_config_index() while keeping the IMEX bare-T<n> suppression;
  rebase the second-layer temperature loop's non-IMEX branch onto upstream's
  get_filament_config_index() resolution.
- Preset.cpp / PresetBundle.cpp / PrintConfig.cpp: keep both sides' option-list
  and enum-map entries.
- GLCanvas3D.cpp: upstream's printable_heights argument plus the IMEX ghost pass.
- PartPlate.cpp: keep <set> (still used).
- test_gcodewriter.cpp / test_3mf.cpp: keep both sides' test cases.

...

This commit is contained in:

Clifford Garwood

2026-07-13 16:22:22 -04:00

parent 0ba09780d1 25216998b3

commit fdb0e20f36

691 changed files with 84512 additions and 2016 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/libslic3r/GCode.cpp

+1190 -231

File diff suppressed because it is too large Load Diff