SoftFever b8172316b8 Merge branch 'v1.7.2-remote' ... Signed-off-by: SoftFever <softfeverever@gmail.com> # Conflicts: # deps/ZLIB/ZLIB.cmake # localization/i18n/OrcaSlicer.pot # localization/i18n/de/OrcaSlicer_de.po # localization/i18n/en/OrcaSlicer_en.po # localization/i18n/es/OrcaSlicer_es.po # localization/i18n/fr/OrcaSlicer_fr.po # localization/i18n/hu/OrcaSlicer_hu.po # localization/i18n/it/OrcaSlicer_it.po # localization/i18n/ja/OrcaSlicer_ja.po # localization/i18n/ko/OrcaSlicer_ko.po # localization/i18n/list.txt # localization/i18n/nl/OrcaSlicer_nl.po # localization/i18n/sv/OrcaSlicer_sv.po # localization/i18n/zh_cn/OrcaSlicer_zh_CN.po # resources/calib/PressureAdvance/pa_pattern.3mf # resources/handy_models/Disc.stl # resources/i18n/de/BambuStudio.mo # resources/i18n/en/BambuStudio.mo # resources/i18n/es/BambuStudio.mo # resources/i18n/fr/BambuStudio.mo # resources/i18n/hu/BambuStudio.mo # resources/i18n/it/BambuStudio.mo # resources/i18n/ja/BambuStudio.mo # resources/i18n/ko/BambuStudio.mo # resources/i18n/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/profiles/Anycubic.json # resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json # resources/profiles/BBL.json # resources/profiles/BBL/filament/Bambu ASA @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/Bambu ASA @BBL X1C 0.4 nozzle.json # resources/profiles/BBL/filament/Bambu ASA @BBL X1C.json # resources/profiles/BBL/filament/Bambu PA-CF @base.json # resources/profiles/BBL/filament/Bambu PA6-CF @BBL X1C.json # resources/profiles/BBL/filament/Bambu PA6-CF @base.json # resources/profiles/BBL/filament/Bambu PETG-CF @BBL X1C.json # resources/profiles/BBL/filament/Bambu Support W @BBL X1.json # resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json # resources/profiles/BBL/filament/Generic HIPS @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/Generic HIPS @BBL X1C.json # resources/profiles/BBL/filament/Generic PA-CF.json # resources/profiles/BBL/filament/Generic PC.json # resources/profiles/BBL/filament/Generic PETG-CF @BBL X1C.json # resources/profiles/BBL/filament/Generic PLA @0.2 nozzle.json # resources/profiles/BBL/filament/Generic PLA High Speed @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/filament/Generic PLA High Speed @BBL P1P.json # resources/profiles/BBL/filament/Generic PLA High Speed @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/Generic PLA High Speed @BBL X1C.json # resources/profiles/BBL/filament/Generic PLA-CF.json # resources/profiles/BBL/filament/Generic PLA.json # resources/profiles/BBL/filament/Generic TPU.json # resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P.json # resources/profiles/BBL/filament/Overture Matte PLA @BBL X1.json # resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C.json # resources/profiles/BBL/filament/Overture Matte PLA @base.json # resources/profiles/BBL/filament/Overture PLA @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/filament/Overture PLA @BBL P1P.json # resources/profiles/BBL/filament/Overture PLA @BBL X1.json # resources/profiles/BBL/filament/Overture PLA @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/Overture PLA @BBL X1C.json # resources/profiles/BBL/filament/Overture PLA @base.json # resources/profiles/BBL/filament/P1P/Bambu TPU 95A @BBL P1P.json # resources/profiles/BBL/filament/P1P/Generic PLA @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/filament/P1P/Generic TPU @BBL P1P.json # resources/profiles/BBL/filament/P1P/eSUN PLA+ @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/filament/P1P/eSUN PLA+ @BBL P1P.json # resources/profiles/BBL/filament/PolyLite ABS @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/filament/PolyLite ABS @BBL P1P.json # resources/profiles/BBL/filament/PolyLite ABS @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/PolyLite ABS @BBL X1C.json # resources/profiles/BBL/filament/PolyLite ABS @base.json # resources/profiles/BBL/filament/PolyLite ASA @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/filament/PolyLite ASA @BBL P1P.json # resources/profiles/BBL/filament/PolyLite ASA @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/PolyLite ASA @BBL X1C.json # resources/profiles/BBL/filament/PolyLite ASA @base.json # resources/profiles/BBL/filament/PolyLite PETG @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/filament/PolyLite PETG @BBL P1P.json # resources/profiles/BBL/filament/PolyLite PETG @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/PolyLite PETG @BBL X1C.json # resources/profiles/BBL/filament/PolyLite PETG @base.json # resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json # resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json # resources/profiles/BBL/filament/eSUN PLA+ @BBL X1.json # resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C.json # resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1S 0.2 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1S 0.4 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1S 0.6 nozzle.json # resources/profiles/BBL/machine/Bambu Lab P1S 0.8 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json # resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json # resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json # resources/profiles/BBL/process/0.06mm Standard @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/process/0.08mm Extra Fine @BBL P1P.json # resources/profiles/BBL/process/0.08mm Extra Fine @BBL X1C.json # resources/profiles/BBL/process/0.08mm Standard @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/process/0.10mm Standard @BBL P1P 0.2 nozzle.json # resources/profiles/BBL/process/0.10mm Standard @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/process/0.12mm Fine @BBL P1P.json # resources/profiles/BBL/process/0.12mm Fine @BBL X1C.json # resources/profiles/BBL/process/0.12mm Standard @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/process/0.14mm Standard @BBL X1C 0.2 nozzle.json # resources/profiles/BBL/process/0.16mm Optimal @BBL P1P.json # resources/profiles/BBL/process/0.16mm Optimal @BBL X1C.json # resources/profiles/BBL/process/0.18mm Standard @BBL X1C 0.6 nozzle.json # resources/profiles/BBL/process/0.20mm Standard @BBL P1P.json # resources/profiles/BBL/process/0.20mm Standard @BBL X1C.json # resources/profiles/BBL/process/0.20mm Strength @BBL P1P.json # resources/profiles/BBL/process/0.20mm Strength @BBL X1C.json # resources/profiles/BBL/process/0.24mm Draft @BBL P1P.json # resources/profiles/BBL/process/0.24mm Draft @BBL X1C.json # resources/profiles/BBL/process/0.24mm Standard @BBL X1C 0.6 nozzle.json # resources/profiles/BBL/process/0.24mm Standard @BBL X1C 0.8 nozzle.json # resources/profiles/BBL/process/0.28mm Extra Draft @BBL P1P.json # resources/profiles/BBL/process/0.28mm Extra Draft @BBL X1C.json # resources/profiles/BBL/process/0.30mm Standard @BBL P1P 0.6 nozzle.json # resources/profiles/BBL/process/0.30mm Standard @BBL X1 0.6 nozzle.json # resources/profiles/BBL/process/0.30mm Standard @BBL X1C 0.6 nozzle.json # resources/profiles/BBL/process/0.30mm Strength @BBL X1C 0.6 nozzle.json # resources/profiles/BBL/process/0.32mm Standard @BBL X1C 0.8 nozzle.json # resources/profiles/BBL/process/0.36mm Standard @BBL X1C 0.6 nozzle.json # resources/profiles/BBL/process/0.40mm Standard @BBL P1P 0.8 nozzle.json # resources/profiles/BBL/process/0.40mm Standard @BBL X1 0.8 nozzle.json # resources/profiles/BBL/process/0.40mm Standard @BBL X1C 0.8 nozzle.json # resources/profiles/BBL/process/0.42mm Standard @BBL X1C 0.6 nozzle.json # resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json # resources/profiles/BBL/process/0.56mm Standard @BBL X1C 0.8 nozzle.json # resources/profiles/BBL/process/fdm_process_bbl_common.json # resources/profiles/Creality.json # resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json # resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json # resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json # resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json # resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json # resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json # resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json # resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json # resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json # resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json # resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json # resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json # resources/profiles/Elegoo.json # resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json # resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json # resources/profiles/Prusa.json # resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json # resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json # resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json # resources/profiles/Tronxy.json # resources/profiles/Tronxy/machine/Tronxy X5SA 400 0.4 nozzle.json # resources/profiles/Tronxy/process/0.08mm Extra Fine @Tronxy.json # resources/profiles/Tronxy/process/0.12mm Fine @Tronxy.json # resources/profiles/Tronxy/process/0.15mm Optimal @Tronxy.json # resources/profiles/Tronxy/process/0.20mm Standard @Tronxy.json # resources/profiles/Tronxy/process/0.24mm Draft @Tronxy.json # resources/profiles/Tronxy/process/0.28mm Extra Draft @Tronxy.json # resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json # resources/web/data/text.js # src/OrcaSlicer.cpp # src/libslic3r/GCode.cpp # src/libslic3r/GCode/SeamPlacer.cpp # src/libslic3r/GCode/SeamPlacer.hpp # src/libslic3r/GCodeWriter.cpp # src/libslic3r/GCodeWriter.hpp # src/libslic3r/Preset.cpp # src/libslic3r/PresetBundle.cpp # src/libslic3r/Print.cpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp # src/libslic3r/TreeSupport.cpp # src/libslic3r/calib.cpp # src/libslic3r/calib.hpp # src/slic3r/GUI/BackgroundSlicingProcess.cpp # src/slic3r/GUI/BedShapeDialog.cpp # src/slic3r/GUI/ConfigManipulation.cpp # src/slic3r/GUI/GUI.cpp # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/GUI_Factories.cpp # src/slic3r/GUI/GUI_ObjectList.cpp # src/slic3r/GUI/Jobs/ArrangeJob.cpp # src/slic3r/GUI/OptionsGroup.cpp # src/slic3r/GUI/PartPlate.cpp # src/slic3r/GUI/PartPlate.hpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/StatusPanel.cpp # src/slic3r/GUI/Tab.cpp # src/slic3r/GUI/Widgets/AMSControl.hpp # version.inc		2023-09-29 19:46:49 +08:00
..
AMSControl.cpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
AMSControl.hpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
AxisCtrlButton.cpp	change app color	2023-01-03 22:05:20 +08:00
AxisCtrlButton.hpp	FIX:use scalablebitmap replace wxbitmap	2022-08-05 16:11:42 +08:00
Button.cpp	Merge remote-tracking branch 'remote/master' into feature/merge_upstream	2023-04-19 08:48:07 +08:00
Button.hpp	ENH: Cut optimization, support for custom connectors	2023-04-17 15:39:02 +08:00
CheckBox.cpp	ENH: [STUDIO-2549] remember my choice on unsaved project/presets	2023-04-17 15:39:02 +08:00
CheckBox.hpp	ENH: [STUDIO-2549] remember my choice on unsaved project/presets	2023-04-17 15:39:02 +08:00
ComboBox.cpp	post changes after merging BS1.7.4	2023-08-26 18:45:43 +08:00
ComboBox.hpp	FIX: [STUDIO-3217] hide dropdown when combobox move by scroll	2023-07-07 17:29:08 +08:00
DropDown.cpp	Merge remote-tracking branch 'BS/v1.7.2'	2023-08-26 16:13:57 +08:00
DropDown.hpp	FIX: [STUDIO-2186] hide PopupWindow on alt-tab	2023-02-22 20:09:17 +08:00
ErrorMsgStaticText.cpp	FIX:fix the device interface button adaptation problem	2022-09-02 12:52:18 +08:00
ErrorMsgStaticText.hpp	FIX:fix the device interface button adaptation problem	2022-09-02 12:52:18 +08:00
FanControl.cpp	ENH:dynamic display of AUX fan	2023-09-22 16:21:26 +08:00
FanControl.hpp	ENH:dynamic display of AUX fan	2023-09-22 16:21:26 +08:00
ImageSwitchButton.cpp	Merge remote-tracking branch 'BS/v1.7.2'	2023-08-26 16:13:57 +08:00
ImageSwitchButton.hpp	NEW:add fan control	2022-12-15 04:38:15 -05:00
Label.cpp	Change NotoSansKR to NanumGothic for Korean font (#1957)	2023-09-02 10:59:31 +08:00
Label.hpp	FIX: [STUDIO-3547] use Label instead of ErrorMsgStaticText	2023-07-07 17:52:43 +08:00
PopupWindow.cpp	FIX: [STUDIO-2186] hide PopupWindow on alt-tab	2023-02-22 20:09:17 +08:00
PopupWindow.hpp	FIX: [STUDIO-2186] hide PopupWindow on alt-tab	2023-02-22 20:09:17 +08:00
ProgressBar.cpp	Feature/fix more colors (#193)	2023-01-18 23:06:39 +08:00
ProgressBar.hpp	change app color	2023-01-03 22:05:20 +08:00
ProgressDialog.cpp	Merge remote-tracking branch 'BS/v1.7.2'	2023-08-26 16:13:57 +08:00
ProgressDialog.hpp	FIX: add load model process dialog	2023-07-07 17:25:51 +08:00
RadioBox.cpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
RadioBox.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
RoundedRectangle.cpp	ENH: refine physical printer dialog	2023-01-10 19:08:26 +08:00
RoundedRectangle.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
Scrollbar.cpp	FIX:fixed scrolling too slow of parameter search scroll bar	2022-08-05 16:11:42 +08:00
Scrollbar.hpp	FIX:fixed scrolling too slow of parameter search scroll bar	2022-08-05 16:11:42 +08:00
ScrolledWindow.cpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
ScrolledWindow.hpp	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
SideButton.cpp	post changes after merging BS1.7.4	2023-08-26 18:45:43 +08:00
SideButton.hpp	FIX:fixed some issues about text	2022-10-20 19:34:37 +08:00
SideMenuPopup.cpp	ENH: Revert "SidePopup actively destroys the window after closing"	2023-07-13 18:34:17 +08:00
SideMenuPopup.hpp	FIX: [STUDIO-2186] hide PopupWindow on alt-tab	2023-02-22 20:09:17 +08:00
SideTools.cpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
SideTools.hpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
SpinInput.cpp	Merge branch 'master-remote' into feature/1.5	2023-03-08 00:08:26 +08:00
SpinInput.hpp	FIX: use StaticBox for background	2022-08-05 16:11:42 +08:00
StateColor.cpp	Fix wxWidgets debugging macros (#1742)	2023-08-09 23:25:25 +08:00
StateColor.hpp	ENH: dark mode of StateColor	2022-12-15 04:38:15 -05:00
StateHandler.cpp	NEW: management camera video stream in device panel	2022-12-15 04:33:48 -05:00
StateHandler.hpp	NEW: management camera video stream in device panel	2022-12-15 04:33:48 -05:00
StaticBox.cpp	FIX: StaticBox zero size bitmap	2023-01-10 19:08:26 +08:00
StaticBox.hpp	FIX: optimize media file panel	2022-10-20 19:34:37 +08:00
StaticLine.cpp	ENH: dark mode of StateColor	2022-12-15 04:38:15 -05:00
StaticLine.hpp	ENH: dark mode of StateColor	2022-12-15 04:38:15 -05:00
StepCtrl.cpp	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
StepCtrl.hpp	NEW:support for displaying extra styles	2023-09-22 16:21:26 +08:00
SwitchButton.cpp	Merge branch 'master-remote' into feature/1.5	2023-03-08 00:08:26 +08:00
SwitchButton.hpp	ENH: [STUDIO-1477] indicators for that has object configs	2022-12-15 04:38:15 -05:00
TabCtrl.cpp	Set default filament color rgb(242, 117, 78)	2023-04-01 22:20:53 +08:00
TabCtrl.hpp	ENH: TabCtrl: support arrow key events	2022-08-26 09:25:59 +08:00
TempInput.cpp	Merge branch 'master-remote' into feature/1.5	2023-03-08 00:08:26 +08:00
TempInput.hpp	ENH:uniform border width of buttons in monitor control	2022-08-26 09:25:59 +08:00
TextCtrl.h	FIX: dark mode of wxTextCtrl	2022-12-15 04:38:15 -05:00
TextInput.cpp	Merge remote-tracking branch 'BS/v1.7.2'	2023-08-26 16:13:57 +08:00
TextInput.hpp	FIX: use StaticBox for background	2022-08-05 16:11:42 +08:00
WebView.cpp	启动时进行 WebView2 运行时检查 (#1944)	2023-08-31 21:36:57 +08:00
WebView.hpp	启动时进行 WebView2 运行时检查 (#1944)	2023-08-31 21:36:57 +08:00