SoftFever
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7729ca83f
								
							
						 | 
						
							
							
								
								Merge BS 1.7.7.89
							
							
							
							
							
							
							
							# Conflicts:
#	bbl/i18n/ko/BambuStudio_ko.po
#	localization/i18n/OrcaSlicer.pot
#	localization/i18n/de/OrcaSlicer_de.po
#	localization/i18n/en/OrcaSlicer_en.po
#	localization/i18n/es/OrcaSlicer_es.po
#	localization/i18n/fr/OrcaSlicer_fr.po
#	localization/i18n/hu/OrcaSlicer_hu.po
#	localization/i18n/it/OrcaSlicer_it.po
#	localization/i18n/ja/OrcaSlicer_ja.po
#	localization/i18n/nl/OrcaSlicer_nl.po
#	localization/i18n/sv/OrcaSlicer_sv.po
#	localization/i18n/zh_cn/OrcaSlicer_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/it/BambuStudio.mo
#	resources/i18n/ja/BambuStudio.mo
#	resources/i18n/ko/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json
#	src/OrcaSlicer.cpp
#	src/libnest2d/include/libnest2d/selections/firstfit.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/slic3r/GUI/CalibrationWizardPresetPage.cpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/PartPlate.hpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc 
							
						 | 
						
							2023-10-21 19:41:49 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									liz.li
								
							 
						 | 
						
							
							
							
							
								
							
							
								760987660f
								
							
						 | 
						
							
							
								
								ENH: add a dailytip
							
							
							
							
							
							
							
							jira: STUDIO-4773
Change-Id: I97a15de5356a5275e648d9eb42f733479803561c 
							
						 | 
						
							2023-10-13 14:43:42 +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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									liz.li
								
							 
						 | 
						
							
							
							
							
								
							
							
								e657f54a6d
								
							
						 | 
						
							
							
								
								FIX: fix a link url error
							
							
							
							
							
							
							
							Change-Id: Ie4c87383e043fc51adddabde1904b03af585181f 
							
						 | 
						
							2023-04-17 15:39:02 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									SoftFever
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b0ba1207e
								
							
						 | 
						
							
							
								
								Change Application name to OrcaSlicer
							
							
							
							
							
						 | 
						
							2023-03-12 10:05:22 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									liz.li
								
							 
						 | 
						
							
							
							
							
								
							
							
								9795cb8d0e
								
							
						 | 
						
							
							
								
								ENH:add next_button in dailytips
							
							
							
							
							
							
							
							1.add next button in dailytips
2.adjust menuitem position of show tip in menu bar
3.add new tip
Change-Id: Idad011b5849d7bddeb36b3a3e7d843aa596023d4 
							
						 | 
						
							2022-12-15 04:33:48 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									liz.li
								
							 
						 | 
						
							
							
							
							
								
							
							
								16e7993a65
								
							
						 | 
						
							
							
								
								ENH:update mo of dailytip
							
							
							
							
							
							
							
							Change-Id: I168159af60bbda827d24238f656aeaa192fd4299 
							
						 | 
						
							2022-10-20 19:34:37 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									yifan.wu
								
							 
						 | 
						
							
							
							
							
								
							
							
								4928ef31b8
								
							
						 | 
						
							
							
								
								FIX: fix some error link in daily tips
							
							
							
							
							
							
							
							Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I2e4fee013eb9544e9ebc5e610508da049da52b10 
							
						 | 
						
							2022-10-20 19:34:37 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									liz.li
								
							 
						 | 
						
							
							
							
							
								
							
							
								8029b62daa
								
							
						 | 
						
							
							
								
								NEW:modify dailytips
							
							
							
							
							
							
							
							Change-Id: I3adc91b6bc2a2288a034678ad2df9b963f3adcf9
(cherry picked from commit fad2d0edf5d87ba7044b257747dcfb9b1090776f) 
							
						 | 
						
							2022-10-20 19:34:37 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									liz.li
								
							 
						 | 
						
							
							
							
							
								
							
							
								d38c5b07fa
								
							
						 | 
						
							
							
								
								FIX:disable an item in dailytip temporarily
							
							
							
							
							
							
							
							Change-Id: I4f60243336d1b6a247733674f75f721dce7444b6 
							
						 | 
						
							2022-10-20 19:34:37 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									liz.li
								
							 
						 | 
						
							
							
							
							
								
							
							
								81da77d1e0
								
							
						 | 
						
							
							
								
								NEW:DailyTips
							
							
							
							
							
							
							
							Change-Id: I510e96652c9a0c9fe422546b09b2d035d9e46a23 
							
						 | 
						
							2022-10-20 19:34:37 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |