SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								35455e6533 
								
							 
						 
						
							
							
								
								Merge branch 'master-remote' into feature/merge_remote_1.3  
							
							... 
							
							
							
							# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Voron.json
#	resources/profiles/Voron/filament/Voron Generic ABS.json
#	resources/profiles/Voron/filament/Voron Generic ASA.json
#	resources/profiles/Voron/filament/Voron Generic PA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PA.json
#	resources/profiles/Voron/filament/Voron Generic PC.json
#	resources/profiles/Voron/filament/Voron Generic PETG.json
#	resources/profiles/Voron/filament/Voron Generic PLA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PLA.json
#	resources/profiles/Voron/filament/Voron Generic PVA.json
#	resources/profiles/Voron/filament/Voron Generic TPU.json
#	resources/profiles/Voron/filament/fdm_filament_abs.json
#	resources/profiles/Voron/filament/fdm_filament_asa.json
#	resources/profiles/Voron/filament/fdm_filament_common.json
#	resources/profiles/Voron/filament/fdm_filament_pa.json
#	resources/profiles/Voron/filament/fdm_filament_pc.json
#	resources/profiles/Voron/filament/fdm_filament_pet.json
#	resources/profiles/Voron/filament/fdm_filament_pla.json
#	resources/profiles/Voron/filament/fdm_filament_pva.json
#	resources/profiles/Voron/filament/fdm_filament_tpu.json
#	resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 0.1.json
#	resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 250.json
#	resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 300.json
#	resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 350.json
#	resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 250.json
#	resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 300.json
#	resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 350.json
#	resources/profiles/Voron/machine/fdm_klipper_common.json
#	resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
#	resources/profiles/Voron/process/0.12mm Fine @Voron.json
#	resources/profiles/Voron/process/0.15mm Optimal @Voron.json
#	resources/profiles/Voron/process/0.20mm Standard @Voron.json
#	resources/profiles/Voron/process/0.24mm Draft @Voron.json
#	resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
#	resources/profiles/Voron/process/fdm_process_voron_common.json
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GLToolbar.cpp
#	src/slic3r/GUI/GLToolbar.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/NotificationManager.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.hpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Plater.hpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/PrintHostDialogs.hpp
#	src/slic3r/Utils/PrintHost.cpp 
							
						 
						
							2022-10-20 23:12:00 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								55d6bbbe21 
								
							 
						 
						
							
							
								
								FIX: replace print file default image  
							
							... 
							
							
							
							Change-Id: I58ff7c02b725c38b9c898fd1d4d4c92bf61c4c24 
							
						 
						
							2022-10-20 19:34:37 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stone Li 
								
							 
						 
						
							
							
							
							
								
							
							
								f968374b46 
								
							 
						 
						
							
							
								
								ENH: some improvements and fixs  
							
							... 
							
							
							
							1. create user folder if not exists
2. add a tips for binding a printer
3. fix sdcard tips
4. modify icons
5. refine layout of task options
Change-Id: Ic0529cf1e8bdde0128052bc42454f6e6aaae87ca
Signed-off-by: Stone Li <stone.li@bambulab.com> 
							
						 
						
							2022-10-20 19:34:37 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								2ed702766b 
								
							 
						 
						
							
							
								
								NEW:add printer tips can link to wiki  
							
							... 
							
							
							
							Change-Id: Id6fc6afbcdfcab9ac0747d9f7228f94aba6c871e 
							
						 
						
							2022-10-20 19:34:37 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								066a4d70c9 
								
							 
						 
						
							
							
								
								NEW:add ams guide wiki  
							
							... 
							
							
							
							Change-Id: I825f9dbbf3aa0a32eb5272b941179025ef2d35e2 
							
						 
						
							2022-10-20 19:34:37 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao.jin 
								
							 
						 
						
							
							
							
							
								
							
							
								d97db7e617 
								
							 
						 
						
							
							
								
								ENH: change extruder icon colour when loading filament  
							
							... 
							
							
							
							Change-Id: Ifd1e9c868702352790de9ddf25f256d504875785 
							
						 
						
							2022-10-20 19:34:37 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								764b7d62a0 
								
							 
						 
						
							
							
								
								Merge mainstream changes  
							
							
							
						 
						
							2022-10-04 13:51:34 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								6dc68c4c9e 
								
							 
						 
						
							
							
								
								FIX: optimize style of media file panel  
							
							... 
							
							
							
							Change-Id: I2e5319538adae84b9b0348874d7b468b0dbc2db1 
							
						 
						
							2022-09-29 11:16:43 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								d41e0db18f 
								
							 
						 
						
							
							
								
								ENH: icon for param group  
							
							... 
							
							
							
							Change-Id: I435830615747aa850ed82621349f5fedfc29d860 
							
						 
						
							2022-09-29 11:16:43 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								673b6418c1 
								
							 
						 
						
							
							
								
								ENH: sync with ams filament  
							
							... 
							
							
							
							Change-Id: Ifa8b9487c934a18ad1003f380bbb53fa9288e387 
							
						 
						
							2022-09-29 11:16:43 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								bf927f5adc 
								
							 
						 
						
							
							
								
								FIX:add the sd card removal function  
							
							... 
							
							
							
							Change-Id: I98592a5d3d4abcfd3a67b8c12fa4cf07e79b0e4b 
							
						 
						
							2022-09-29 11:16:43 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								bb74438f7c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remote/master' into SoftFever  
							
							... 
							
							
							
							# Conflicts:
#	src/libslic3r/Preset.cpp 
							
						 
						
							2022-09-09 21:54:57 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								264aad9b4b 
								
							 
						 
						
							
							
								
								FIX:add new effect of disabling print operations  
							
							... 
							
							
							
							Change-Id: I19cd39205785fc2d4321016746a2dc19cff98c5b 
							
						 
						
							2022-09-08 21:49:36 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								f5c7919424 
								
							 
						 
						
							
							
								
								FIX:update new icon of print operation  
							
							... 
							
							
							
							Change-Id: I0ae3402710c37875d5443f4ea70e0d8da8572c44 
							
						 
						
							2022-09-08 21:49:36 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stone Li 
								
							 
						 
						
							
							
							
							
								
							
							
								2dc2d8252d 
								
							 
						 
						
							
							
								
								NEW: support software limit of axis control  
							
							... 
							
							
							
							Change-Id: I0d241aeddeed112b21ed576ce793c3e9f061c923
Signed-off-by: Stone Li <stone.li@bambulab.com> 
							
						 
						
							2022-09-08 21:49:36 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								4fd174175c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remote/master' into SoftFever  
							
							
							
						 
						
							2022-09-03 00:17:59 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stone Li 
								
							 
						 
						
							
							
							
							
								
							
							
								0ed5b956ae 
								
							 
						 
						
							
							
								
								NEW: add ams option when sending a printing job  
							
							... 
							
							
							
							Change-Id: If75b9da926c1d9a9e59f3e16b3d491a6e0bdb2e6
Signed-off-by: Stone Li <stone.li@bambulab.com> 
							
						 
						
							2022-09-02 13:16:54 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								115995e46d 
								
							 
						 
						
							
							
								
								ENH: export current preset configs  
							
							... 
							
							
							
							Change-Id: I75642f9786ed14e4e6e2048f4a70e7bb49bff03f
(cherry picked from commit 31886319c0a3f1adea301e01a9f49834c1c92670) 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								3b021d4443 
								
							 
						 
						
							
							
								
								FIX:replace new camera icons  
							
							... 
							
							
							
							Change-Id: Ibd8b178260733a4b95198687d90d111b542462e1 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								36ca76c2a4 
								
							 
						 
						
							
							
								
								ENH: Auxiliary GUI  
							
							... 
							
							
							
							Change-Id: Iaefd8bb6a2a560f4f2ec8235b21231763d8562fe 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao.jin 
								
							 
						 
						
							
							
							
							
								
							
							
								16bbcf6f97 
								
							 
						 
						
							
							
								
								NEW:change menu_add_part.svg  
							
							... 
							
							
							
							Change-Id: I5305777efc27d6c0f3761aad68b633ee29ed6e5c 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								ffb1f706d8 
								
							 
						 
						
							
							
								
								NEW:update the new print progress layout  
							
							... 
							
							
							
							Change-Id: I4390c9ef5de3d050178bebe5d1dc60213a400280 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									xiangdong.yang 
								
							 
						 
						
							
							
							
							
								
							
							
								ea4651e70e 
								
							 
						 
						
							
							
								
								NEW:add Gizmo text menu  
							
							... 
							
							
							
							Change-Id: Ie5a5793e4d852188af60b40dfd6a9072727cf3d0 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									xiangdong.yang 
								
							 
						 
						
							
							
							
							
								
							
							
								dbe354995e 
								
							 
						 
						
							
							
								
								ENH:Optimized Gizmo toolbar layout  
							
							... 
							
							
							
							Change-Id: I9e323c310abd2afcf0f9586ba261f714dd718f38 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									xiangdong.yang 
								
							 
						 
						
							
							
							
							
								
							
							
								03d29b3989 
								
							 
						 
						
							
							
								
								FIX:change modifier icon  
							
							... 
							
							
							
							Change-Id: If0a1425d020f6da575a95b8ba58bc85f497635c9 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									yifan.wu 
								
							 
						 
						
							
							
							
							
								
							
							
								b068389d4c 
								
							 
						 
						
							
							
								
								NEW: add text gizmo tool  
							
							... 
							
							
							
							Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I77fdf64340f580e6baa3260101fa1c6db7a4ab2d
(cherry picked from commit 2147c55134b4d9d1018d7e9f4f8d1a4d50c065f6) 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								769bc14a8a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remote/master' into SoftFever  
							
							... 
							
							
							
							# Conflicts:
#	src/libslic3r/PerimeterGenerator.cpp 
							
						 
						
							2022-08-28 12:03:49 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								6e1e56be18 
								
							 
						 
						
							
							
								
								NEW: refine HMS Panel  
							
							... 
							
							
							
							link to hms wiki page
Change-Id: I1b1c5b2021f9f68320235ce17580ae80ea9b82a3
Signed-off-by: Stone Li <stone.li@bambulab.com> 
							
						 
						
							2022-08-26 09:25:59 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								488b1cd8f5 
								
							 
						 
						
							
							
								
								Support upload g-code to third-party printers  
							
							... 
							
							
							
							* wip
* fix cmake warning
* add UI and config options for Moonraker connection
* wip: copy whole print host UI from PS
* add more needed options
* wip 2
* fix string issue on Mac
* wip3
* fix cmake warning
* working
need tweaks
* cleanup
* support thumbnail
* fix DNS resolving issue in Windows
* code clean up 
							
						 
						
							2022-08-20 23:06:41 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								82127a92c9 
								
							 
						 
						
							
							
								
								Revert "Support upload g-code to third-party printers ( #2 )"  
							
							... 
							
							
							
							This reverts commit dc5e0eed34 
							
						 
						
							2022-08-20 23:05:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc5e0eed34 
								
							 
						 
						
							
							
								
								Support upload g-code to third-party printers ( #2 )  
							
							... 
							
							
							
							* wip
* fix cmake warning
* add UI and config options for Moonraker connection
* wip: copy whole print host UI from PS
* add more needed options
* wip 2
* fix string issue on Mac
* wip3 
							
						 
						
							2022-08-20 15:09:05 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								aac23eb6b4 
								
							 
						 
						
							
							
								
								ENH:adjust AMSMaterial clickable region  
							
							... 
							
							
							
							Change-Id: If81e156fde4f9c724844a7bce6fd97db1d98b4e3 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									xiangdong.yang 
								
							 
						 
						
							
							
							
							
								
							
							
								6fe6d36e17 
								
							 
						 
						
							
							
								
								ENH:Change the keyboard icon  
							
							... 
							
							
							
							Change-Id: I21f9989a846e318db6d4190d8683badf2a27f7ff 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									xiangdong.yang 
								
							 
						 
						
							
							
							
							
								
							
							
								afa549d410 
								
							 
						 
						
							
							
								
								FIX:update new layout  
							
							... 
							
							
							
							Change-Id: If57f072621115d99e9f8a94b59dd345a14d882d4
(cherry picked from commit 6b02e2bc5a3d5f92cbcb9303740779213eadeae4) 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stone Li 
								
							 
						 
						
							
							
							
							
								
							
							
								ad7e4d6de9 
								
							 
						 
						
							
							
								
								ENH: refine thumbnail of printing job on mac retina screen  
							
							... 
							
							
							
							Change-Id: Ie71e586947e3914f8448a153d7e699471ddaccb9
Signed-off-by: Stone Li <stone.li@bambulab.com> 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								78037d9163 
								
							 
						 
						
							
							
								
								FIX:fixed macos desktop ICONS are too large  
							
							... 
							
							
							
							Change-Id: Ibca0a06c3ae3f400e96159260148c85c7ac4efda 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								1ce994fda3 
								
							 
						 
						
							
							
								
								ENH:replace reset icon to unlock  
							
							... 
							
							
							
							Change-Id: Id46e9aad3b31c67d48651478525cc4a5dc512382 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								807cc2236d 
								
							 
						 
						
							
							
								
								FIX: focus state of CheckBox  
							
							... 
							
							
							
							Change-Id: Iceac4b9877a07e4517250255203c2e0ecdbc34ac 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								da732ac396 
								
							 
						 
						
							
							
								
								FIX:optimize RDIF animation  
							
							... 
							
							
							
							Change-Id: I45e45b92efa43f290151e39715ca057da4d862c1 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								63c3ea2634 
								
							 
						 
						
							
							
								
								FIX:fixed taskbar icons being too large on MacOS  
							
							... 
							
							
							
							Change-Id: I696a877bb62106cd3b6530fd78810eafdaec79c9 
							
						 
						
							2022-08-05 15:28:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									yifan.wu 
								
							 
						 
						
							
							
							
							
								
							
							
								c1ac1d8cfc 
								
							 
						 
						
							
							
								
								ENH: rename Fragment Filter to Gap Fill  
							
							... 
							
							
							
							Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: If9b417c0bb80d2a9f331c1878507df427690f348 
							
						 
						
							2022-07-25 10:17:49 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								e9e4d75877 
								
							 
						 
						
							
							
								
								Update the codes to 01.01.00.10 for the formal release  
							
							... 
							
							
							
							1. first formal version of macos
2. add the bambu networking plugin install logic
3. auto compute the wipe volume when filament change
4. add the logic of wiping into support
5. refine the GUI layout and icons, improve the gui apperance in lots of
   small places
6. serveral improve to support
7. support AMS auto-mapping
8. disable lots of unstable features: such as params table, media file download, HMS
9. fix serveral kinds of bugs
10. update the document of building
11. ... 
							
						 
						
							2022-07-22 20:35:34 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								1555904bef 
								
							 
						 
						
							
							
								
								Add the full source of BambuStudio  
							
							... 
							
							
							
							using version 1.0.10 
							
						 
						
							2022-07-15 23:42:08 +08:00