grant0013
8dfd480c52
Merge branch 'upstream/main' into harktech/k2-discovery
...
Consolidates #13744 (CFS filament sync) into this PR per maintainer
request and resyncs with main. Conflicts resolved:
* src/slic3r/GUI/Plater.cpp -- parallel else-if added by both sides
(htCrealityPrint + flashforge_local_api branches); kept both.
* src/slic3r/GUI/PhysicalPrinterDialog.cpp -- both sides added a
host-specific Browse dialog (Creality DNS-SD + Flashforge); kept
both as early-return branches, fall through to BonjourDialog.
* src/slic3r/GUI/PrintHostDialogs.hpp -- parallel class declarations
(CrealityPrintHostSendDialog + FlashforgePrintHostSendDialog);
kept both.
2026-05-28 07:56:06 +00:00
..
2026-05-18 19:00:48 +03:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-04-26 20:17:08 +08:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-05-21 10:32:52 +00:00
2026-05-18 19:00:48 +03:00
2026-05-15 20:44:33 -03:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-05-27 22:58:39 +08:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-05-15 20:44:33 -03:00
2026-04-26 20:17:08 +08:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-04-26 20:17:08 +08:00
2026-05-15 20:44:33 -03:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-05-15 20:44:33 -03:00
2026-04-26 20:17:08 +08:00
2026-04-26 20:17:08 +08:00
2026-04-26 20:17:08 +08:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-05-27 22:58:39 +08:00
2026-05-18 19:00:48 +03:00
2026-05-18 19:00:48 +03:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-05-20 22:55:58 +08:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-05-28 12:08:19 +08:00
2026-04-26 20:17:08 +08:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-05-27 22:29:40 +08:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-04-26 20:17:08 +08:00
2026-04-26 20:17:08 +08:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-04-26 20:17:08 +08:00
2026-05-18 19:00:48 +03:00
2026-05-12 20:17:22 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-21 10:32:52 +00:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-27 22:58:39 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-27 22:58:39 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-28 12:08:19 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00
2026-05-22 02:27:34 +08:00