| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 salt.wei | aca131cfc0 | ENH: change picture size of ender3 Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2b7c2b4e7d35dd8d19473e13918cc27bf9d75649 | 2022-10-20 19:34:37 +08:00 |  | 
				
					
						| 
								
								
									 salt.wei | d47d82bf43 | ENH: add preset for ender3 printer As title.
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2d9b1aaeadfe945a6a90f34cdb10a1f240a50ae4
(cherry picked from commit a223ab23605c3ef96ae878b9c4d2199520b4f201) | 2022-10-20 19:34:37 +08:00 |  | 
				
					
						| 
								
								
									 salt.wei | cd82f70002 | ENH: add preset of voron As title. Thanks SoftFever.
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I752413251b7699f8d1d26c44d71d912e1ef09c7b
(cherry picked from commit 606a69173e10d0a45e1f1987c36e45c3c89a7f09) | 2022-10-20 19:34:37 +08:00 |  | 
				
					
						| 
								
								
									 SoftFever | 5db7c30463 | Revert "Add support for FLSun V400(WIP)" This reverts commit 58871a08e0. | 2022-09-30 16:18:32 +08:00 |  | 
				
					
						| 
								
								
									 SoftFever | 58871a08e0 | Add support for FLSun V400(WIP) | 2022-09-25 13:41:43 +08:00 |  | 
				
					
						| 
								
								
									 SoftFever | a3b3b368e2 | Profile rework (#4) * default BBL profile
* voron
* wip
* Voron profile
* Prusa MK3S
* add Prusa mk3s
* fix an issue that print_host value was not retrieved.
* add chamber temperature option for filament
* slightly adjust thumbernail angle
* Revert "slightly adjust thumbernail angle"
This reverts commit 6ad38efb36.
* add `one wall on first layer` option
* save preset for connection
* remove unused options
* set default 3000 accl for MK3S
* tweak profile
* update Voron logo
* UI twwaks
* Readme update
* change abs default nozzle temp
* misc
* tweak profiles
* Update README | 2022-08-24 15:40:43 +08:00 |  | 
				
					
						| 
								
								
									 SoftFever | 02e8f6c697 | Add Anycubic 4Max Pro support | 2022-07-23 10:31:41 +08:00 |  | 
				
					
						| 
								
								
									 SoftFever | dbaef259cf | Add Voron 0.1 and Prusa MK3S support | 2022-07-19 06:27:26 -07:00 |  | 
				
					
						| 
								
								
									 SoftFever | 8b429ccd4a | fix voron image ratio issue | 2022-07-19 06:27:26 -07:00 |  | 
				
					
						| 
								
								
									 SoftFever | 9a57fc204f | reduce image size | 2022-07-19 06:27:26 -07:00 |  | 
				
					
						| 
								
								
									 SoftFever | e4b79afeac | Add Voron machine support | 2022-07-19 06:27:26 -07:00 |  | 
				
					
						| 
								
								
									 lane.wei | 1555904bef | Add the full source of BambuStudio using version 1.0.10 | 2022-07-15 23:42:08 +08:00 |  |