122 commits

Author	SHA1	Message	Date
SoftFever	81ca7720e9	change BambuStudio to OrcaSlicer	2023-03-10 19:26:01 +08:00
SoftFever	5ef51f6c8a	Merge branch 'master-remote' into feature/1.5 ... Signed-off-by: SoftFever <softfeverever@gmail.com> # Conflicts: # bbl/i18n/BambuStudio.pot # bbl/i18n/de/BambuStudio_de.po # bbl/i18n/en/BambuStudio_en.po # bbl/i18n/es/BambuStudio_es.po # bbl/i18n/fr/BambuStudio_fr.po # bbl/i18n/hu/BambuStudio_hu.po # bbl/i18n/it/BambuStudio_it.po # bbl/i18n/nl/BambuStudio_nl.po # bbl/i18n/sv/BambuStudio_sv.po # bbl/i18n/zh_cn/BambuStudio_zh_CN.po # deps/Boost/Boost.cmake # deps/wxWidgets/wxWidgets.cmake # resources/config.json # 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/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/images/tips_arrow.svg # resources/profiles/Anycubic.json # resources/profiles/Anycubic/filament/Anycubic Generic ABS.json # resources/profiles/Anycubic/filament/Anycubic Generic ASA.json # resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json # resources/profiles/Anycubic/filament/Anycubic Generic PA.json # resources/profiles/Anycubic/filament/Anycubic Generic PC.json # resources/profiles/Anycubic/filament/Anycubic Generic PETG.json # resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json # resources/profiles/Anycubic/filament/Anycubic Generic PLA.json # resources/profiles/Anycubic/filament/Anycubic Generic PVA.json # resources/profiles/Anycubic/filament/Anycubic Generic TPU.json # resources/profiles/Anycubic/filament/fdm_filament_common.json # resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json # resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json # resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json # resources/profiles/Anycubic/process/fdm_process_common.json # resources/profiles/BBL.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 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/Voron.json # resources/web/data/text.js # resources/web/image/printer/Anycubic 4Max Pro_cover.png # src/BambuStudio.cpp # src/libslic3r/GCode.cpp # src/libslic3r/GCode.hpp # src/libslic3r/GCode/GCodeProcessor.cpp # src/libslic3r/GCodeWriter.hpp # src/libslic3r/PerimeterGenerator.cpp # src/libslic3r/PresetBundle.cpp # src/libslic3r/Print.cpp # src/libslic3r/Print.hpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp # src/libslic3r/PrintObject.cpp # src/slic3r/GUI/AMSMaterialsSetting.cpp # src/slic3r/GUI/AMSMaterialsSetting.hpp # src/slic3r/GUI/AmsMappingPopup.cpp # src/slic3r/GUI/AmsMappingPopup.hpp # src/slic3r/GUI/Auxiliary.cpp # src/slic3r/GUI/BackgroundSlicingProcess.cpp # src/slic3r/GUI/ConfigManipulation.cpp # src/slic3r/GUI/DeviceManager.cpp # src/slic3r/GUI/DeviceManager.hpp # src/slic3r/GUI/ExtrusionCalibration.cpp # src/slic3r/GUI/GCodeViewer.cpp # src/slic3r/GUI/GCodeViewer.hpp # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/IMSlider.cpp # src/slic3r/GUI/Jobs/PrintJob.cpp # src/slic3r/GUI/Jobs/PrintJob.hpp # src/slic3r/GUI/Jobs/SendJob.cpp # src/slic3r/GUI/Jobs/SendJob.hpp # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/MainFrame.hpp # src/slic3r/GUI/MediaPlayCtrl.cpp # src/slic3r/GUI/OptionsGroup.cpp # src/slic3r/GUI/PhysicalPrinterDialog.cpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/PrintHostDialogs.cpp # src/slic3r/GUI/Printer/BambuTunnel.h # src/slic3r/GUI/Printer/PrinterFileSystem.cpp # src/slic3r/GUI/Printer/gstbambusrc.c # src/slic3r/GUI/Printer/gstbambusrc.h # src/slic3r/GUI/ReleaseNote.cpp # src/slic3r/GUI/ReleaseNote.hpp # src/slic3r/GUI/SelectMachine.cpp # src/slic3r/GUI/SendToPrinter.cpp # src/slic3r/GUI/SetBedTypeDialog.cpp # src/slic3r/GUI/StatusPanel.cpp # src/slic3r/GUI/StatusPanel.hpp # src/slic3r/GUI/Tab.cpp # src/slic3r/GUI/Widgets/AMSControl.cpp # src/slic3r/GUI/Widgets/AMSControl.hpp # src/slic3r/GUI/Widgets/ImageSwitchButton.cpp # src/slic3r/GUI/Widgets/Label.cpp # src/slic3r/GUI/WipeTowerDialog.cpp # src/slic3r/Utils/Process.cpp # src/slic3r/Utils/bambu_networking.hpp # version.inc	2023-03-08 00:08:26 +08:00
Stone Li	4a580d37df	ENH: send print job through cloud only for P1P ... Change-Id: Id89a0a60be91f415eb6d586ac11f70849c9cb01f Signed-off-by: Stone Li <stone.li@bambulab.com>	2023-02-24 09:23:57 +08:00
tao wang	875c851b61	ENH:optimize the detection of FTP connection status ... Change-Id: I9e7095959f3933e5fa22a0b274d221b1c2c42878	2023-02-24 09:23:57 +08:00
chunmao.guo	a03dc779b6	FIX: [STUDIO-2186] hide PopupWindow on alt-tab ... Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf4 (cherry picked from commit 7ddaf5260df19c76fca82e525caca26e55732fa9)	2023-02-22 20:09:17 +08:00
战马	5f69f4c016	FIX: Revert "[STUDIO-2186] hide PopupWindow on alt-tab" ... This reverts commit 3b8c11659a6cf3062ad27772348b84be5001a4f6. Reason for revert: update pick Change-Id: Id991af5b4a5950ee76ecf59176eabc72c885db88	2023-02-22 20:09:17 +08:00
chunmao.guo	81dea77932	FIX: [STUDIO-2186] hide PopupWindow on alt-tab ... Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf3	2023-02-22 20:09:17 +08:00
Stone Li	fbc4de136f	NEW: support to config ftp_folder for printer [P1P] ... Change-Id: I6a3b2a67d2950e2c1c5267bb7c65d5594924caec Signed-off-by: Stone Li <stone.li@bambulab.com> (cherry picked from commit 176e505bcf5f48971302d9aff14e74b118eeafbe)	2023-02-22 20:09:17 +08:00
tao wang	a94b78d296	ENH:add network verification process for LAN printing ... Change-Id: I0a9e9fa5e9746f5ceb989b00c6b44e812d071132	2023-02-22 20:09:17 +08:00
chunmao.guo	b3a4384aec	ENH: save ams list to compare with last sync ... Change-Id: I44db0b0a61cf366929aed6ab703407e5d9b170b7	2023-02-22 20:09:17 +08:00
tao wang	9936c2b823	ENH:lan mode printer will display the identification of LAN ... Change-Id: I39535210fcf5720918c7d5425032d9ff450e4840	2023-02-22 20:09:17 +08:00
tao wang	1fc0a752db	ENH:add the function of using FTP only ... Change-Id: If2dc3d1c9d913d1aacd426640a01a714d45a6774	2023-02-22 20:09:17 +08:00
Stone Li	f4bd9dac87	ENH: set amsMapping info when use_ams is false ... Change-Id: Idd7c8ca171806fcf5897eb6f257bb68e68ec8070	2023-02-22 20:09:17 +08:00
SoftFever	dfd658c00c	Cherry pick some fixes from mainstream ... FIX: crush when slicer multi-color model the root cause is a mismatch between the dimensions of flush matrix and the number of extruders Change-Id: I3a4ca706cb24d9e5d33969b9e6f5b288e71bb8f2 (cherry picked from commit 7399037eaacdfd7d8407667a2e5a097757265254) FIX: fix crash when switch printer Change-Id: I7632689c5df07df0222a5fa529993e114d7c5b08 Signed-off-by: Stone Li <stone.li@bambulab.com> ENH:close the amsmapping dialog when exit seletmachine dialog Change-Id: Ib49b1f9d08267c56b34d867edb40f287114479e1 ENH:no longer hide the unload button when connected to AMS Change-Id: I62c7195d590827bd189c6e6886e95c2cf755e203 FIX: fix the slicing result different issue when move volume in objects copied from other object the result is not correct Change-Id: Ieebc586f11c42429902d653e871c038d096783e8 FIX: support blocker not work on vertical+horizontal faces Jira: STUDIO-2088 Change-Id: I6803e8e90ebcc4c67d81473f60fdf97929011e12 (cherry picked from commit 738800c5af48ab8a2cde40b6f2b3c48a88bfee8b) FIX:fixed send print will crash when resources path is chinese path Change-Id: Ie4a5161f853dca691bd69e5695720d99148a0134	2023-02-17 23:44:48 +08:00
Stone Li	3e8671bcdf	FIX: fix lan_file mode for P1P ... Change-Id: I71ffdb28363fe45b2d5bab01d34846c2462921a6 Signed-off-by: Stone Li <stone.li@bambulab.com>	2023-02-02 12:14:41 +08:00
tao wang	150ed6a2d5	ENH:close the amsmapping dialog when exit seletmachine dialog ... Change-Id: Ib49b1f9d08267c56b34d867edb40f287114479e1	2023-02-02 12:14:41 +08:00
Stone Li	eb11c364e5	FIX: fix blank error msg of slicing warning ... Change-Id: Idca57158b0139411a775a6b83cce2200694a5f2d Signed-off-by: Stone Li <stone.li@bambulab.com>	2023-02-01 16:24:44 +08:00
tao wang	9a8f832498	ENH:Update IP address input process ... Change-Id: Iaf1c187dac117ba10ac16045049a346f7c2b9478 Signed-off-by: Stone Li <stone.li@bambulab.com>	2023-02-01 16:24:44 +08:00
Stone Li	d25f7535a9	ENH: add tips for P1P when printing all is not supported ... Change-Id: I5caa5dbc2d9cd3c57318a2366c8a8ef494d4df31 Signed-off-by: Stone Li <stone.li@bambulab.com>	2023-02-01 16:24:44 +08:00
SoftFever	2492e5d39c	merge upstream changes ... Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>	2023-01-21 00:37:10 +08:00
SoftFever	1bdedb1c47	Feature/fix more colors (#193) ... * fix more colors * fix more color on Mac Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> * fix new windows issue on Mac Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> #137 * Support more PrusaSlicer variables Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> * enhance compatibility: bed_shape and wipe_start_x * fix more color * build deps * only build for PR Signed-off-by: SoftFever <softfeverever@gmail.com> Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> Signed-off-by: SoftFever <softfeverever@gmail.com>	2023-01-18 23:06:39 +08:00
SoftFever	6f5af33c2d	QoL: remember choice ... Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>	2023-01-16 20:58:42 +08:00
tao wang	48ceca536b	FIX:dynamically update layout when options are changed ... Change-Id: I57633604428e42f4a67dfcfd80336ab33767e099	2023-01-10 19:08:26 +08:00
Stone Li	9bc46daf40	ENH: optimize the copy description format ... remove "\n" from _L macro Change-Id: If1beda4a77f1c2b42945657b7386e155b8bc7a20 Signed-off-by: Stone Li <stone.li@bambulab.com>	2023-01-10 19:08:26 +08:00
chunmao.guo	aa880e34a7	ENH: detect printer uses ssl for local connection ... Change-Id: I6131bf5ed1f6d44f0bd761ad6bc3a492ba4945b7 (cherry picked from commit c68d48ecf290e5abd37a97654c5b1f7779f061e2)	2023-01-10 19:08:26 +08:00
SoftFever	9c1a7bbf8b	change app color	2023-01-03 22:05:20 +08:00
SoftFever	260156648d	Merge branch 'master-remote' into SoftFever ... # Conflicts: # bbl/i18n/BambuStudio.pot # bbl/i18n/de/BambuStudio_de.po # bbl/i18n/en/BambuStudio_en.po # bbl/i18n/es/BambuStudio_es.po # bbl/i18n/fr/BambuStudio_fr.po # bbl/i18n/hu/BambuStudio_hu.po # bbl/i18n/nl/BambuStudio_nl.po # bbl/i18n/sv/BambuStudio_sv.po # bbl/i18n/zh_cn/BambuStudio_zh_CN.po # 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/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/profiles/BBL.json # resources/profiles/Creality.json # resources/profiles/Voron.json # src/libslic3r/PrintConfig.cpp # src/libslic3r/TreeSupport.cpp # src/slic3r/GUI/DeviceManager.cpp # src/slic3r/GUI/ReleaseNote.cpp # version.inc	2022-12-31 15:15:58 +08:00
SoftFever	25e3944c53	QOLchange: Don't add Untitled string if project name is set	2022-12-29 23:11:24 +08:00
SoftFever	a688719e72	Revert "Merge branch 'SoftFever' into feature/calib" ... This reverts commit f5b28201fe, reversing changes made to d9e9fb2206. # Conflicts: # version.inc	2022-12-25 12:39:45 +08:00
SoftFever	d733ab7e7b	Merge branch 'master' into SoftFever ... Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> # Conflicts: # resources/i18n/zh_cn/BambuStudio.mo # src/libslic3r/TreeSupport.cpp # version.inc	2022-12-21 16:54:14 +08:00
Stone Li	c6152a70e9	FIX: add get_used_extruders interface ... Change-Id: I03f0dca933c0aa9de893bc86b268ea727eeee9fb Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-19 06:13:10 -05:00
SoftFever	bf8a9fee1f	Merge branch 'master' into SoftFever ... # Conflicts: # bbl/i18n/zh_cn/BambuStudio_zh_CN.po # 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/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/profiles/Creality.json # resources/profiles/Voron.json # resources/web/guide/3/index.html # src/libslic3r/AppConfig.cpp # src/libslic3r/GCode.cpp # src/libslic3r/GCode/GCodeProcessor.cpp # src/libslic3r/LayerRegion.cpp # src/libslic3r/Preset.cpp # src/libslic3r/Print.cpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp # src/libslic3r/PrintObject.cpp # src/slic3r/GUI/AboutDialog.cpp # src/slic3r/GUI/BBLTopbar.cpp # src/slic3r/GUI/ConfigManipulation.cpp # src/slic3r/GUI/ConfigWizard.cpp # src/slic3r/GUI/GCodeViewer.cpp # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/GUI_Factories.cpp # src/slic3r/GUI/MainFrame.cpp # src/slic3r/GUI/Plater.cpp # src/slic3r/GUI/Tab.cpp # version.inc	2022-12-16 13:59:30 +08:00
Stone Li	52847b8bb4	ENH: valid print all when selecting blank plate ... and give a tips when print blank plate Change-Id: Ic243dcee87d4a5a09de91c5806f1a94735f1052b Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:38:15 -05:00
Stone Li	89f7065d87	ENH: do not check same physical printer with printer preset ... Change-Id: Idfcc80816828c2a65cbdfb12785598df92006a76 Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:38:15 -05:00
tao wang	ffbb7a8be5	FIX:fixed some dark mode issues ... Change-Id: I778150853f02ea9d13705acca1041ef79f3747ef	2022-12-15 04:38:15 -05:00
Stone Li	ab5f2aa3f7	FIX: fix get wrong extruders for printing ... Change-Id: Icecdca05c314fe47314ec197c6d651967bd616d2	2022-12-15 04:38:15 -05:00
tao wang	0db1b52b23	FIX:fixed some issue with send print and ams ui ... Change-Id: I1a37bad6ec1f193f9fd98c74506b3bb0358ece6d	2022-12-15 04:38:15 -05:00
Stone Li	dcbe442184	ENH: request start when it stopped by app ... Change-Id: I48b8692f87b834e0f96c7c19c4e8651ae7a8fc1e Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:38:15 -05:00
yifan.wu	0acad21707	ENH: update Chinese translations ... Signed-off-by: yifan.wu <yifan.wu@bambulab.com> Change-Id: I369cc80e3d7fb0c7d3292663d1fdf70544f8c765	2022-12-15 04:38:15 -05:00
Stone Li	005e8f5533	ENH: sort device list by dev_name in monitor ... Change-Id: I1800407a30d3cafc52328cb29019ef6c5f7d5909	2022-12-15 04:38:15 -05:00
Stone Li	0b452dc65b	ENH: can not send print job when the consistency upgrade is required ... Change-Id: I7a0c974d3dcfe54fd271e234513489cc0dd358d0 Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:38:15 -05:00
tao wang	75ddeb7572	ENH:file rename support Enter key confirmation ... Change-Id: I708d120d132dac7f1bf14bb508310ba55987ad4c	2022-12-15 04:38:15 -05:00
Arthur	4419703f41	ENH: do not add L prefix to empty string ... Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4	2022-12-15 04:38:15 -05:00
tao wang	4a5c473058	NEW:lan mode interaction optimization ... Change-Id: I80eef918fe1ac4c8e306787bd7b9437262686e23	2022-12-15 04:38:15 -05:00
Stone Li	e7408b171a	NEW: add warnings when sending print job ... tpu can not be used with ams Change-Id: Icf93b0daed017eb1b378daba00b754bbf18ad354 Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:38:15 -05:00
tao.jin	e217baad50	ENH: refine display of camera state and add setting ... Change-Id: I85f02565e1581fde9a6c161f4fbed0283fda208f	2022-12-15 04:38:15 -05:00
tao wang	dc7822e816	ENH:losing focus when renaming is automatically saved ... Change-Id: I411e824e4b7154aa85e14d1c0aae3ddf979bd259	2022-12-15 04:38:15 -05:00
tao.jin	2ffa56633c	ENH: rebuild warning dialog with frame ... Change-Id: Id4a8ab80ecec30b668de59556823dad6838276fe	2022-12-15 04:38:15 -05:00
Stone Li	5b7ebc3684	FIX: fix use ams always checked ... Change-Id: Iaf4e894bab3ca2bd2f57e174ad4fcae517ec20cf Signed-off-by: Stone Li <stone.li@bambulab.com>	2022-12-15 04:38:15 -05:00
Stone Li	b81a26d019	ENH: can not send print task when printer need force upgrading ... Change-Id: I3be5c9c54b3a5fb448b1e96901df8aa7ffbffbd8	2022-12-15 04:38:15 -05:00