SoftFever 59bab91da9 Merge branch 'merge-upstream' ... Signed-off-by: SoftFever <softfeverever@gmail.com> # Conflicts: # src/libslic3r/Preset.cpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp		2023-09-30 09:51:56 +08:00
..
ASCIIFolding.cpp	FIX: delete special symbol for filename	2023-07-07 17:29:08 +08:00
ASCIIFolding.hpp	FIX: delete special symbol for filename	2023-07-07 17:29:08 +08:00
AstroBox.cpp	Upload changes	2023-08-27 18:07:48 +08:00
AstroBox.hpp	Upload changes	2023-08-27 18:07:48 +08:00
bambu_networking.hpp	NEW: update bambu network header and version	2023-09-22 16:21:26 +08:00
Bonjour.cpp	Fix build warnings on windows, fix various bugs/logic errors/missing returns/etc, update boost::bind (#2229)	2023-09-27 23:55:23 +08:00
Bonjour.hpp	fix errors after cherry picking commits	2023-08-27 22:44:37 +08:00
CalibUtils.cpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
CalibUtils.hpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
ColorSpaceConvert.cpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
ColorSpaceConvert.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
Duet.cpp	Upload changes	2023-08-27 18:07:48 +08:00
Duet.hpp	Upload changes	2023-08-27 18:07:48 +08:00
FixModelByWin10.cpp	FIX: repair: fix the state not correct issue after repair	2023-01-10 19:08:26 +08:00
FixModelByWin10.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
FlashAir.cpp	Upload changes	2023-08-27 18:07:48 +08:00
FlashAir.hpp	Upload changes	2023-08-27 18:07:48 +08:00
HexFile.cpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
HexFile.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
Http.cpp	ENH: close logging in console of libcurl	2023-08-04 18:15:25 +08:00
Http.hpp	Update the codes to 01.01.00.10 for the formal release	2022-07-22 20:35:34 +08:00
json_diff.cpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
json_diff.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
MacDarkMode.hpp	FIX: [STUDIO-1570] wkwebview background color	2022-12-15 04:38:15 -05:00
MacDarkMode.mm	FIX: [STUDIO-1940] hide edit ctrl on scroll in ObjectList	2023-04-17 15:39:02 +08:00
minilzo_extension.cpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
minilzo_extension.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
MKS.cpp	Upload changes	2023-08-27 18:07:48 +08:00
MKS.hpp	Upload changes	2023-08-27 18:07:48 +08:00
NetworkAgent.cpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
NetworkAgent.hpp	NEW: update bambu network header and version	2023-09-22 16:21:26 +08:00
OctoPrint.cpp	Fix compatibility with STL builds of wxWidgets (#2218)	2023-09-25 23:35:30 +08:00
OctoPrint.hpp	fix errors after cherry picking commits	2023-08-27 22:44:37 +08:00
PresetUpdater.cpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
PresetUpdater.hpp	ENH: Updater: always update plugin to the newest compatible version	2022-11-26 15:39:32 +08:00
PrintHost.cpp	Upload changes	2023-08-27 18:07:48 +08:00
PrintHost.hpp	fix errors after cherry picking commits	2023-08-27 22:44:37 +08:00
Process.cpp	FIX: [STUDIO-2509] open self for new window on mac	2023-04-17 15:39:02 +08:00
Process.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
Profile.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
Repetier.cpp	Upload changes	2023-08-27 18:07:48 +08:00
Repetier.hpp	Upload changes	2023-08-27 18:07:48 +08:00
RetinaHelper.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
RetinaHelperImpl.hmm	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
RetinaHelperImpl.mm	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
Serial.cpp	Support upload g-code to third-party printers	2022-08-20 23:06:41 +08:00
Serial.hpp	Support upload g-code to third-party printers	2022-08-20 23:06:41 +08:00
TCPConsole.cpp	Fix build warnings on windows, fix various bugs/logic errors/missing returns/etc, update boost::bind (#2229)	2023-09-27 23:55:23 +08:00
TCPConsole.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
UndoRedo.cpp	NEW:add paint tool in assembly view	2023-07-07 17:25:51 +08:00
UndoRedo.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00