SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								191a04be16 
								
							 
						 
						
							
							
								
								Add skirt height  
							
							
							
						 
						
							2022-12-24 12:21:32 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								693c044047 
								
							 
						 
						
							
							
								
								change workflow  
							
							
							
						 
						
							2022-12-24 00:02:53 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								d4780c3a97 
								
							 
						 
						
							
							
								
								apply z hop  
							
							
							
						 
						
							2022-12-24 00:02:34 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								a8cf77a2b0 
								
							 
						 
						
							
							
								
								small changes  
							
							
							
						 
						
							2022-12-23 17:25:04 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								a3bae2f9a5 
								
							 
						 
						
							
							
								
								draft version  
							
							
							
						 
						
							2022-12-23 11:12:44 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								1df89650e9 
								
							 
						 
						
							
							
								
								pa works  
							
							
							
						 
						
							2022-12-22 22:41:45 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								0bf74c97c3 
								
							 
						 
						
							
							
								
								disable PA when printing numbers  
							
							
							
						 
						
							2022-12-22 22:38:24 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								8c46a57036 
								
							 
						 
						
							
							
								
								wip  
							
							
							
						 
						
							2022-12-22 16:09:03 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								f5b28201fe 
								
							 
						 
						
							
							
								
								Merge branch 'SoftFever' into feature/calib  
							
							
							
						 
						
							2022-12-21 17:09:45 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								d9e9fb2206 
								
							 
						 
						
							
							
								
								init  
							
							
							
						 
						
							2022-12-21 17:05:27 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								41078e6555 
								
							 
						 
						
							
							
								
								refactor and improve layer time display  
							
							
							
						 
						
							2022-12-20 22:24:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								1eb54c49a6 
								
							 
						 
						
							
							
								
								revert changes for min_layer_height check, there was legacy config on user's machine that won't pass this check. (why?)  
							
							
							
						 
						
							2022-12-20 11:41:11 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								57b4f3cf68 
								
							 
						 
						
							
							
								
								change default wall loop to 3  
							
							... 
							
							
							
							Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> 
							
						 
						
							2022-12-20 11:32:54 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								92360f75ed 
								
							 
						 
						
							
							
								
								remove redundant send button for 3rd printers  
							
							... 
							
							
							
							Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> 
							
						 
						
							2022-12-20 11:27:40 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								daf5384b5a 
								
							 
						 
						
							
							
								
								Add Layer Time/Layer time(Log).  
							
							... 
							
							
							
							Main logic is ported from SuperSlicer
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com> 
							
						 
						
							2022-12-19 23:58:24 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								3d8eca022f 
								
							 
						 
						
							
							
								
								temporary disable assert on Mac  
							
							
							
						 
						
							2022-12-19 23:57:35 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								78f6c429c1 
								
							 
						 
						
							
							
								
								FIX: [STUDIO-1800] enable_user_preset_folder before load preset  
							
							... 
							
							
							
							Change-Id: I3b877db994440359e56aa2fa13d13b1d9a98f978 
							
						 
						
							2022-12-19 19:34:08 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								e32792c305 
								
							 
						 
						
							
							
								
								FIX: [STUDIO-1800] enable_user_preset_folder before load preset  
							
							... 
							
							
							
							Change-Id: I3b877db994440359e56aa2fa13d13b1d9a98f978 
							
						 
						
							2022-12-19 06:13:10 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stone Li 
								
							 
						 
						
							
							
							
							
								
							
							
								55b6bc5563 
								
							 
						 
						
							
							
								
								ENH: do not show the functions if it is not supported  
							
							... 
							
							
							
							Change-Id: Iaee9c756f40fd26c376160e9cda305bee88d713b
Signed-off-by: Stone Li <stone.li@bambulab.com> 
							
						 
						
							2022-12-19 06:13:10 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								c1ad24d660 
								
							 
						 
						
							
							
								
								FIX:fixed cant not set cover img of 3mf  
							
							... 
							
							
							
							Change-Id: I3beabd0ccd9fad1e5c48b8c92cc58aba9a4c4210 
							
						 
						
							2022-12-19 06:13:10 -05: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								ca00918f85 
								
							 
						 
						
							
							
								
								BuildLinuxImage.sh: Remove data dir creation  
							
							... 
							
							
							
							Fixed in c25c1ba4eb 
							
						 
						
							2022-12-19 02:28:54 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								f8a92b2b3f 
								
							 
						 
						
							
							
								
								BuildLinuxImage.sh: Remove forced light theme  
							
							
							
						 
						
							2022-12-19 02:28:54 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								030063c8d5 
								
							 
						 
						
							
							
								
								Skip AMS filaments for 3rd party printers  
							
							
							
						 
						
							2022-12-18 20:32:56 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								85f774a72d 
								
							 
						 
						
							
							
								
								fix max layer height issue when open the app for the first time  
							
							
							
						 
						
							2022-12-18 11:51:25 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								0e64b47f9d 
								
							 
						 
						
							
							
								
								expose bed_exclude_area feature to thirdparty printer  
							
							
							
						 
						
							2022-12-18 10:30:41 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								32364ee7ee 
								
							 
						 
						
							
							
								
								fix a small ui issue  
							
							
							
						 
						
							2022-12-18 10:30:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								c25c1ba4eb 
								
							 
						 
						
							
							
								
								ENH: linux: create data dir when not exists  
							
							... 
							
							
							
							Change-Id: Icaf5f3a74b52e3ada5db6a4354df6584bbf669cf 
							
						 
						
							2022-12-17 03:21:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									MusangKing 
								
							 
						 
						
							
							
							
							
								
							
							
								6096de0020 
								
							 
						 
						
							
							
								
								FIX: Solve cracked layers of tree support under adaptive slicing  
							
							... 
							
							
							
							fix bug of empty layers when meeting similar large layer height of tree support
TODO: hybrid(auto) still has dangling layers at the botttom.
Github#826
Change-Id: I6d5dfa9a610403e51ea82c1d86444f8645dc3210
(cherry picked from commit ea38988f0b5ba22c5b7c3b212d510f649dd23301) 
							
						 
						
							2022-12-17 03:21:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									MusangKing 
								
							 
						 
						
							
							
							
							
								
							
							
								18f794e4fa 
								
							 
						 
						
							
							
								
								ENH: Optimize TreeSupport  
							
							... 
							
							
							
							New function plan_layer_heights added for pre-planning maximum layer heights
Previous adjust_layer_heights function has been commentted out.
Change-Id: I8ec5bb7b7e700ed7655d18a17d0b15de5f026592
(cherry picked from commit 55995c138e0375b8055f31768eea1392cd64168d) 
							
						 
						
							2022-12-17 03:21:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								ee59ac76a9 
								
							 
						 
						
							
							
								
								FIX:fixed display wrong color of the color picker button  
							
							... 
							
							
							
							Change-Id: I09f955545f5e1adf28842f51394ae63ec1fe3576 
							
						 
						
							2022-12-17 03:21:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									salt.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								1e5c746429 
								
							 
						 
						
							
							
								
								ENH: disable smooth timelapse in vase mode  
							
							... 
							
							
							
							Smooth timelaps has wipe tower and cause seam in vase
mode. Don't support
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I7aef1fc1ec2f5d57713fcc01e45ce99f385471c1
(cherry picked from commit 671203ada7c5d48a4eabad156d68d7cb1bb37b54) 
							
						 
						
							2022-12-17 03:21:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zhimin.zeng 
								
							 
						 
						
							
							
							
							
								
							
							
								915e5a0e69 
								
							 
						 
						
							
							
								
								FIX: model copy problem  
							
							... 
							
							
							
							Change-Id: I1e32a5a89271a4bdc100599bb6a513e48c545313
(cherry picked from commit eb3755126a2df23045857e4081ba50a42ca5168c) 
							
						 
						
							2022-12-17 03:21:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur Tang 
								
							 
						 
						
							
							
							
							
								
							
							
								9ca84ba948 
								
							 
						 
						
							
							
								
								FIX: sync with master on TreeSupport.hpp  
							
							... 
							
							
							
							Change-Id: I5a7eab9fcf1d46ac4a3748c66eb163fb5cc289da 
							
						 
						
							2022-12-17 03:21:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								c08fc0c5dc 
								
							 
						 
						
							
							
								
								Change layer height checking logic.  
							
							... 
							
							
							
							max min layer height should be compared against `Layer height limits` parameter instead of hardcoded value 
							
						 
						
							2022-12-17 16:05:49 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								bafd7356d6 
								
							 
						 
						
							
							
								
								update version to beta3  
							
							
							
						 
						
							2022-12-17 11:57:31 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								73679f6f2e 
								
							 
						 
						
							
							
								
								TreeSupport: Fix UTF-8 errors  
							
							... 
							
							
							
							Let's just translate the comments into English while we are at it. 
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								93bfa10d4e 
								
							 
						 
						
							
							
								
								MediaPlayCtrl: Add missing string_file header  
							
							
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								c6ac8193e3 
								
							 
						 
						
							
							
								
								HintsToPot: Fix compilation on MSVC  
							
							
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								9cfe3c6016 
								
							 
						 
						
							
							
								
								Add more missing headers  
							
							
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								06a06714c1 
								
							 
						 
						
							
							
								
								WebView: Only include the private header on Windows and macOS  
							
							... 
							
							
							
							The wrapper isn't used in the Linux code path. Some distributions'
wxWidgets packages don't ship the private headers. 
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								a78bed0fd7 
								
							 
						 
						
							
							
								
								GUI_ObjectTable: Fix casting of wxGridCellEditorEvtHandler  
							
							... 
							
							
							
							Fixes linking errors like:
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(GUI_ObjectTable.cpp.o): in function `wxClassInfo::IsKindOf(wxClassInfo const*) const':
/nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:99: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:93: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo'
/nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/hzl7rsdq0k6affzy2rz35lhn51lq6zh3-wxwidgets-3.1.5/include/wx-3.1/wx/rtti.h:88: undefined reference to `wxGridCellEditorEvtHandler::ms_classInfo' 
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								daade424cb 
								
							 
						 
						
							
							
								
								WebView: Only include webview_edge.h when enabled  
							
							
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								0c83c2884b 
								
							 
						 
						
							
							
								
								3mf: Correctly include expat.h  
							
							
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								9b1429144b 
								
							 
						 
						
							
							
								
								GCodeProcessor: Add missing mutex include  
							
							
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								99043bbb02 
								
							 
						 
						
							
							
								
								Add missing includes for boost::filesystem::load_string_file  
							
							... 
							
							
							
							Deprecated in Boost 1.79.0 and no longer included by
filesystem.hpp. 
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zhaofeng Li 
								
							 
						 
						
							
							
							
							
								
							
							
								f4f871c906 
								
							 
						 
						
							
							
								
								Use fstream from boost::nowide  
							
							... 
							
							
							
							Fixes build on Boost 1.79.0. 
							
						 
						
							2022-12-16 22:51:07 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								1938ab44ba 
								
							 
						 
						
							
							
								
								fix an bug that wrong bed type was used for thirdparty printers  
							
							
							
						 
						
							2022-12-17 11:11:55 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								55b5a6ff58 
								
							 
						 
						
							
							
								
								fix mac  
							
							
							
						 
						
							2022-12-16 23:15:27 +08:00