SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								d85654b540 
								
							 
						 
						
							
							
								
								fix some issues in profiles  
							
							
							
						 
						
							2023-04-29 10:29:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								5b0ba1207e 
								
							 
						 
						
							
							
								
								Change Application name to OrcaSlicer  
							
							
							
						 
						
							2023-03-12 10:05:22 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								3470460931 
								
							 
						 
						
							
							
								
								fix colors  
							
							
							
						 
						
							2023-03-09 01:05:51 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								54aae68874 
								
							 
						 
						
							
							
								
								FIX: optimize text display  
							
							... 
							
							
							
							Change-Id: I4e44e12786a1af34cca35edb3c32d9f500b933ed 
							
						 
						
							2023-01-10 19:08:26 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Heiko Liebscher 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ba8f23706 
								
							 
						 
						
							
							
								
								fix typo and color ( #138 )  
							
							... 
							
							
							
							* fix typo and color
* fix error 
							
						 
						
							2023-01-08 20:59:33 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Heiko Liebscher 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								964f2163cb 
								
							 
						 
						
							
							
								
								fix_color_to_#009688 and hover btn ( #125 )  
							
							... 
							
							
							
							* fix_color_to_#009688 and hover btn
* fix_color_main_menu
* fix double ##
* tooltip_color
* fix bitmapcache.cpp 
							
						 
						
							2023-01-06 21:22:20 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								64281a8cc5 
								
							 
						 
						
							
							
								
								fix wrong css color  
							
							... 
							
							
							
							#116  
						
							2023-01-05 21:12:23 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								9c1a7bbf8b 
								
							 
						 
						
							
							
								
								change app color  
							
							
							
						 
						
							2023-01-03 22:05:20 +08: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								11162ef257 
								
							 
						 
						
							
							
								
								ENH: remove 3d model entrance  
							
							... 
							
							
							
							Change-Id: I121a544fec002b87bc409d1b5de857e32ab7427a 
							
						 
						
							2022-12-15 04:38:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								1c71204e55 
								
							 
						 
						
							
							
								
								ENH: icon before text  
							
							... 
							
							
							
							Change-Id: I714aa5d744bb7d6e83b2a58add37bc67302fdd25 
							
						 
						
							2022-12-15 04:38:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								d965a93673 
								
							 
						 
						
							
							
								
								ENH:  ScrollBar Color  
							
							... 
							
							
							
							Change-Id: Ice87a8ddae0ccadaa63652bb4fa8464c4bee408f
(cherry picked from commit 5db33442578ac72433131229889cc1055527de74) 
							
						 
						
							2022-12-15 04:38:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								b29404febf 
								
							 
						 
						
							
							
								
								FIX: background color of popup dialog  
							
							... 
							
							
							
							Change-Id: I2ff95a45cac40be3ceb3920739a86833ac730898
(cherry picked from commit 9fdefaa7f97b70fb6c74d75ef133d5b7a677c63a) 
							
						 
						
							2022-12-15 04:38:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								e6e72a90b6 
								
							 
						 
						
							
							
								
								ENH: adjust right area scrolBar and text color  
							
							... 
							
							
							
							Change-Id: Ic430728bef302fec47a4304679cc5955a435d5e3
(cherry picked from commit 2a28dd67098e298957a83bb4d446623844db6bd8) 
							
						 
						
							2022-12-15 04:38:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								30a473c977 
								
							 
						 
						
							
							
								
								ENH: Add darkmode of Html,depend on UserAgent  
							
							... 
							
							
							
							Change-Id: I8b60db9e2cb7b0d163288e3d8a23db10b64b9bb3 
							
						 
						
							2022-12-15 04:38:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								7d717a9cb4 
								
							 
						 
						
							
							
								
								ENH: In case of low resolution, UserGuide Display  
							
							... 
							
							
							
							Change-Id: I14b764dc5f34421cadba329c9cd7a13fde0f2387
(cherry picked from commit 7c9ba185143a3d6ba96b2f28e479add3e6fe32df) 
							
						 
						
							2022-12-15 04:38:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								9ec439c8f5 
								
							 
						 
						
							
							
								
								NEW: add model Depot Button  
							
							... 
							
							
							
							Change-Id: I64f3e54dab3cd66b400d7dc1519f3ce84eba2fae
(cherry picked from commit 84e964bdd8eb63347a3fefcefe82c9cae6e52c5f) 
							
						 
						
							2022-12-15 04:33:48 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									SoftFever 
								
							 
						 
						
							
							
							
							
								
							
							
								4a20f7c22a 
								
							 
						 
						
							
							
								
								uncheck send data by default  
							
							
							
						 
						
							2022-11-29 23:06:09 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								428f5ed6a9 
								
							 
						 
						
							
							
								
								ENH: Only Default Choose Bambu 0.4 Nozzel  
							
							... 
							
							
							
							Change-Id: I4fe32929e50cc9f45fda620399c7ea3e49cf998f
(cherry picked from commit 0df73d322859145ff65ccbbaa08205881209a9f2) 
							
						 
						
							2022-10-20 19:34:37 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								c818ca165f 
								
							 
						 
						
							
							
								
								ENH: Fix Default Material Logic  
							
							... 
							
							
							
							Change-Id: Iac40c7717e55ca7c2502cfd1012e33e1e6d88695 
							
						 
						
							2022-09-09 19:59:27 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									liz.li 
								
							 
						 
						
							
							
							
							
								
							
							
								121dccc59c 
								
							 
						 
						
							
							
								
								ENH:close dialog by pressing esc key  
							
							... 
							
							
							
							Change-Id: Ib883e7119699e06f63c61dd083ad761ba58bc19c 
							
						 
						
							2022-09-02 12:52:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								2ac9267e42 
								
							 
						 
						
							
							
								
								ENH: filament just show bundle machine  
							
							... 
							
							
							
							Change-Id: If0a35037dc4b08df7cd3aaf88662638a334196e3
(cherry picked from commit 5ebd67880a679c3013fe10b63b509761eab30670) 
							
						 
						
							2022-08-26 09:25:59 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								cd73537f6f 
								
							 
						 
						
							
							
								
								ENH:  Optimize some web UI  
							
							... 
							
							
							
							Change-Id: I91f6691e5e5c19274c1bc3e6a9386e3f76ab259d 
							
						 
						
							2022-08-05 16:11:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zorro.zhang 
								
							 
						 
						
							
							
							
							
								
							
							
								e43f80e875 
								
							 
						 
						
							
							
								
								ENH: support 3rd printer model  
							
							... 
							
							
							
							Change-Id: Ib8c2c846f73a6ac14339e1d0222204d7440de014 
							
						 
						
							2022-08-05 16:11:42 +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