SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								adae24a847 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/merge_upstream  
							
							
							
						 
						
							2023-04-23 22:54:41 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								afe5e9ed2a 
								
							 
						 
						
							
							
								
								simplify the v400 bed mesh, make it smaller  
							
							
							
						 
						
							2023-04-23 18:48:11 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								55c766b8ba 
								
							 
						 
						
							
							
								
								Add bed model for FLSun V400  #825  
							
							... 
							
							
							
							Bed Model is a remix to make it compatible with Orca Slicer. Original model can be found  from @mcpea (https://www.printables.com/model/311792-custom-buildplate-flsun-400-prusa-slicer/files )
Adjust bed texture so the logo is less white. The original bed texture is made by @Art3Design(https://www.printables.com/model/315387-flsun-v400-prusaslicer-profile ) 
							
						 
						
							2023-04-23 16:47:44 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								0c364705ed 
								
							 
						 
						
							
							
								
								update some settings for FLSun V400 profile  
							
							
							
						 
						
							2023-04-23 11:59:54 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								d43182480c 
								
							 
						 
						
							
							
								
								Fix some wrong top_surface_line_width values for VzBot machine.  
							
							... 
							
							
							
							@simonvez 
							
						 
						
							2023-04-23 10:12:59 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								338aa0a6ae 
								
							 
						 
						
							
							
								
								Fixed an Pressure Advance calibration issue(line) for delta machines  #803  
							
							... 
							
							
							
							(cherry picked from commit 27f92f12dc 
							
						 
						
							2023-04-23 09:15:25 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								6ee076ab5e 
								
							 
						 
						
							
							
								
								Disabling acceleration control persists single M204 command in gcode  #795  
							
							... 
							
							
							
							(cherry picked from commit 40ecd8c831 
							
						 
						
							2023-04-23 09:15:16 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								a685633e87 
								
							 
						 
						
							
							
								
								gridline more depth  
							
							... 
							
							
							
							(cherry picked from commit 3ea5a75388 
							
						 
						
							2023-04-23 09:15:07 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								c48aca1704 
								
							 
						 
						
							
							
								
								tweak gridlines  
							
							... 
							
							
							
							(cherry picked from commit f037c3406c 
							
						 
						
							2023-04-23 09:14:36 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								27f92f12dc 
								
							 
						 
						
							
							
								
								Fixed an Pressure Advance calibration issue(line) for delta machines  #803  
							
							
							
						 
						
							2023-04-22 17:27:41 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								40ecd8c831 
								
							 
						 
						
							
							
								
								Disabling acceleration control persists single M204 command in gcode  #795  
							
							
							
						 
						
							2023-04-22 09:48:14 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								3ea5a75388 
								
							 
						 
						
							
							
								
								gridline more depth  
							
							
							
						 
						
							2023-04-20 21:00:58 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								a5d4fca039 
								
							 
						 
						
							
							
								
								resize SW-x2 bed texture  
							
							
							
						 
						
							2023-04-20 00:38:19 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								3216c873b5 
								
							 
						 
						
							
							
								
								optimize vzbot bed texture  
							
							
							
						 
						
							2023-04-20 00:37:40 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								5485e8729c 
								
							 
						 
						
							
							
								
								optimize vzbot bed texture  
							
							
							
						 
						
							2023-04-20 00:37:07 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								4098a5267c 
								
							 
						 
						
							
							
								
								Merge branch 'main' into feature/merge_upstream  
							
							
							
						 
						
							2023-04-19 23:22:13 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a9356fbd20 
								
							 
						 
						
							
							
								
								Merge pull request  #788  from simonvez/main  
							
							... 
							
							
							
							Adding VzBoT profiles 
							
						 
						
							2023-04-19 23:14:51 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								f037c3406c 
								
							 
						 
						
							
							
								
								tweak gridlines  
							
							
							
						 
						
							2023-04-19 19:49:21 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								aa8c6c1ee3 
								
							 
						 
						
							
							
								
								resize SW-x2 bed texture  
							
							
							
						 
						
							2023-04-19 19:21:37 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								9f598046d1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remote/master' into feature/merge_upstream  
							
							... 
							
							
							
							# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	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/ja/OrcaSlicer.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/ams_humidity_2.svg
#	resources/images/ams_humidity_3.svg
#	resources/images/ams_humidity_4.svg
#	resources/images/ams_humidity_tips.svg
#	resources/images/monitor_state_on.svg
#	resources/images/sdcard_state_normal.svg
#	resources/profiles/BBL.json
#	resources/profiles/BBL/filament/Bambu PETG-CF @base.json
#	resources/profiles/BBL/filament/Generic PETG-CF @base.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/web/data/text.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	src/BambuStudio.cpp
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/Brim.cpp
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/ExPolygon.hpp
#	src/libslic3r/Fill/FillBase.hpp
#	src/libslic3r/Format/bbs_3mf.cpp
#	src/libslic3r/GCodeWriter.cpp
#	src/libslic3r/Line.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/wxMediaCtrl2.cpp
#	src/slic3r/Utils/Process.cpp
#	version.inc 
							
						 
						
							2023-04-19 08:48:07 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									VzBoT 
								
							 
						 
						
							
							
							
							
								
							
							
								da09ebcc86 
								
							 
						 
						
							
							
								
								Adding VzBoT profiles  
							
							
							
						 
						
							2023-04-17 22:40:13 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gerrit 
								
							 
						 
						
							
							
							
							
								
							
							
								1f155868bc 
								
							 
						 
						
							
							
								
								ci: update build version to 01.06.00.65  
							
							... 
							
							
							
							Change-Id: Ic02997afaf94adb5294e3e041df79ccab3a16a1b 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									zhimin.zeng 
								
							 
						 
						
							
							
							
							
								
							
							
								aaf513b356 
								
							 
						 
						
							
							
								
								FIX: modify the cut picture  
							
							... 
							
							
							
							Change-Id: I58588d03c4e265d6f7b42ae3339769e1c918b2f8 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								b2d82e7bbb 
								
							 
						 
						
							
							
								
								ENH: thumbnail: regenerate thumbnail for old 3mfs in cli  
							
							... 
							
							
							
							Change-Id: Ia420b4c6aee072eb2a542dff574260c40de47f7d 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gerrit 
								
							 
						 
						
							
							
							
							
								
							
							
								e31b12f5d7 
								
							 
						 
						
							
							
								
								ci: update build version to 01.06.00.64  
							
							... 
							
							
							
							Change-Id: I5d13d3bb5e75745159db7e406c02e3b84c433bba 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								0dfbc7e719 
								
							 
						 
						
							
							
								
								FIX: conflict of setting-id  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8eb290e4c1f86635b8d1cbafa80a221ab8ea967c 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur 
								
							 
						 
						
							
							
							
							
								
							
							
								0f61902c8e 
								
							 
						 
						
							
							
								
								ENH: add cn translation for conflict check  
							
							... 
							
							
							
							Change-Id: Id2c034567dbbf8878a601af1af16f1c8d24d1033 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									manch1n 
								
							 
						 
						
							
							
							
							
								
							
							
								87eb0f3665 
								
							 
						 
						
							
							
								
								ENH: show the layer and height of conflict position  
							
							... 
							
							
							
							Change-Id: If80e81b5556f5afc3228a00edc2593bd8cfe63e4
(cherry picked from commit 895e0f2ecf8e259cfdb7c27081b767bfbaa3ffb6) 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lane.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								98f3aaa4bf 
								
							 
						 
						
							
							
								
								ENH: CLI: add the gcode path check logic for cli  
							
							... 
							
							
							
							Change-Id: I424a93d9ca945598da861a1905da07ae14663157 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur 
								
							 
						 
						
							
							
							
							
								
							
							
								1a7b12fa38 
								
							 
						 
						
							
							
								
								FIX: auto-arranging result may fail clearance check  
							
							... 
							
							
							
							We add 0.001mm tolerance.
Change-Id: I630cc680db0a3a65a6a44e177de686fbac1e1f15
(cherry picked from commit 170f9c2a89d03060f9a9aa43952c0759ffbe7c1f) 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gerrit 
								
							 
						 
						
							
							
							
							
								
							
							
								1cf688725a 
								
							 
						 
						
							
							
								
								ci: update build version to 01.06.00.63  
							
							... 
							
							
							
							Change-Id: Ic7f9b55de7683565e44fcc7e5969d09b0947e14b 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								06da649391 
								
							 
						 
						
							
							
								
								NEW:add chinese translation for confirmation before sending  
							
							... 
							
							
							
							Change-Id: I4f2c07e7dfdbdf64b419cc1e119c1d622642ddad 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								63c9b81127 
								
							 
						 
						
							
							
								
								ENH: update the temp of high plate of PLA Silk  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I1154af98d966aa7a0f384538944d569c190ffd41 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								d930667103 
								
							 
						 
						
							
							
								
								FIX:fixed sending print to LAN printer will crash  
							
							... 
							
							
							
							Change-Id: I067724e8ebef3425a84f6a230685c48fe48ed055 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gerrit 
								
							 
						 
						
							
							
							
							
								
							
							
								3af80a8252 
								
							 
						 
						
							
							
								
								ci: update build version to 01.06.00.62  
							
							... 
							
							
							
							Change-Id: I07c035585188c7a244c7f6c703bfce4b70483785 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								ef6827a6f8 
								
							 
						 
						
							
							
								
								FIX:fixed gradient filament color display on MacOS  
							
							... 
							
							
							
							Change-Id: I57f3243f5013b8d26ace3fae2cc41e807494af6b 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gerrit 
								
							 
						 
						
							
							
							
							
								
							
							
								975aa70651 
								
							 
						 
						
							
							
								
								ci: update build version to 01.06.00.61  
							
							... 
							
							
							
							Change-Id: I6fcbbf51e3550b0f9b163d3fbe061aaa0f51fdab 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								64e203e05c 
								
							 
						 
						
							
							
								
								FIX:fixed some icons cant display when change dark mode  
							
							... 
							
							
							
							Change-Id: I0984aab97e1a1c151e9173d96c8f012935c48fcb 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur 
								
							 
						 
						
							
							
							
							
								
							
							
								719f273fa2 
								
							 
						 
						
							
							
								
								ENH: improve smoothness of tree supports  
							
							... 
							
							
							
							1. Instead of smoothing top-down, now we smooth tree branches bottom-up, and do not stop at merged nodes.
2. Fix a bug where some nodes don't have child. This is critical for bottom-up smoothing.
Change-Id: Iac0fecd81dac541ca390bcf5cbdfe7fd66cfd3a2
(cherry picked from commit 536a8a4f0ef76fa0358f4b4b181c4c7e7fff8bc7) 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gerrit 
								
							 
						 
						
							
							
							
							
								
							
							
								763cf8ebfc 
								
							 
						 
						
							
							
								
								ci: update build version to 01.06.00.60  
							
							... 
							
							
							
							Change-Id: Iea950e408c28ece068fbb93bd02f141be16026c6 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									chunmao.guo 
								
							 
						 
						
							
							
							
							
								
							
							
								f90974cea7 
								
							 
						 
						
							
							
								
								FIX: only send error log for user triggered live view  
							
							... 
							
							
							
							Change-Id: Ie2ff3b95d17bb060e203a51dce30c662e63320b6 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								307ade3cd1 
								
							 
						 
						
							
							
								
								ENH:start checking printer connection status after clicking Send  
							
							... 
							
							
							
							Change-Id: Ibdd8a12b66b649b54b400433f4b3754fc1da478d 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									maosheng.wei 
								
							 
						 
						
							
							
							
							
								
							
							
								4d234b9785 
								
							 
						 
						
							
							
								
								FIX: Cancel sequence number  
							
							... 
							
							
							
							Jira: STUDIO-2688
Change-Id: I29d992354713dcc8caaa8fc2ab98506f1b4e0735
(cherry picked from commit f7a69618813648b0c611c9dfbff3a0ad1d7a18d6) 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								9ca8593604 
								
							 
						 
						
							
							
								
								FIX:update the confirm content before sending for print  
							
							... 
							
							
							
							Change-Id: I9f6d8060c0c142ee966042a49a4158cb5697c5af 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stone Li 
								
							 
						 
						
							
							
							
							
								
							
							
								a8a057e514 
								
							 
						 
						
							
							
								
								FIX: compible with old firmware  
							
							... 
							
							
							
							Change-Id: I66803f95c73ffb82f539c2bfb509266ba9fdb846 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tao wang 
								
							 
						 
						
							
							
							
							
								
							
							
								7e5ddccabe 
								
							 
						 
						
							
							
								
								FIX:fixed incorrect english words  
							
							... 
							
							
							
							Change-Id: Ic1b581d9fbba8cd8be09a9c068a160c1bec6369a 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								4c41f46163 
								
							 
						 
						
							
							
								
								ENH: add filament_is_support to all files  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I439ef9a2902563874d748be9aa9fe067e99588e6 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								b2fbd6b09a 
								
							 
						 
						
							
							
								
								ENH: Cool Plate -> Cool Plate/PLA Plate  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iaee7fb0df3a515b3fa726e16d7363e7c56ded7c2 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									manch1n 
								
							 
						 
						
							
							
							
							
								
							
							
								b5b7264e99 
								
							 
						 
						
							
							
								
								ENH: add wipe tower into conflict check  
							
							... 
							
							
							
							Change-Id: I9684ec17ccbfdea39deae6e5089b74ce3124d57b
(cherry picked from commit f6ee82b4ecf8bf9de91d0043b514cdabb7284b7e) 
							
						 
						
							2023-04-17 15:39:02 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									qing.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								60c444f627 
								
							 
						 
						
							
							
								
								FIX: crash while using MontionLine pattern  
							
							... 
							
							
							
							Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I75232db2902a3d255336fecae7e5e628dc5ac3ba 
							
						 
						
							2023-04-17 15:39:02 +08:00