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
..
2022-12-15 04:38:15 -05:00
2023-04-17 15:39:02 +08:00
2023-04-17 15:39:02 +08:00
2023-04-17 15:39:02 +08:00
2023-04-17 15:39:02 +08:00
2023-04-17 15:39:02 +08:00
2023-04-17 15:39:02 +08:00
2022-08-05 16:11:42 +08:00
2022-08-05 16:11:42 +08:00
2022-08-05 16:11:42 +08:00
2022-08-05 16:11:42 +08:00
2022-08-05 16:11:42 +08:00
2022-08-05 16:11:42 +08:00
2022-08-05 16:11:42 +08:00
2022-08-05 16:11:42 +08:00
2022-12-15 04:38:15 -05:00
2022-10-20 19:34:37 +08:00
2022-12-15 04:38:15 -05:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 22:25:38 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2022-12-22 22:41:45 +08:00
2022-12-22 22:41:45 +08:00
2022-08-05 16:11:42 +08:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2023-01-18 23:06:39 +08:00
2022-12-15 04:38:15 -05:00
2023-04-17 15:39:02 +08:00
2023-04-17 15:39:02 +08:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2023-01-18 23:06:39 +08:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2023-03-17 19:16:36 +08:00
2022-08-26 09:25:59 +08:00
2022-08-26 09:25:59 +08:00
2022-08-26 09:25:59 +08:00
2023-03-09 01:05:51 +08:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2023-03-09 01:05:51 +08:00
2022-12-15 04:38:15 -05:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 21:05:54 +08:00
2023-03-17 19:16:36 +08:00
2023-03-17 19:16:36 +08:00
2023-04-12 17:05:23 +08:00
2023-03-17 19:16:36 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-12-15 04:33:48 -05:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-29 11:16:43 +08:00
2022-09-02 12:52:18 +08:00
2022-09-02 12:52:18 +08:00
2022-09-02 12:52:18 +08:00
2023-01-18 23:06:39 +08:00
2022-12-15 04:38:15 -05:00
2022-12-15 04:38:15 -05:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2023-03-17 21:05:54 +08:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00
2022-12-15 04:38:15 -05:00
2022-09-02 12:52:18 +08:00
2022-12-15 04:38:15 -05:00
2022-09-02 12:52:18 +08:00
2023-03-09 01:05:51 +08:00
2022-07-15 23:42:08 +08:00
2022-12-15 04:38:15 -05:00
2022-07-15 23:42:08 +08:00
2022-07-15 23:42:08 +08:00