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
..
calib	fix non-manifold issue for temp tower	2023-02-25 19:23:41 +08:00
cert	FIX: [STUDIO-1908] add printer cert and version compatible	2023-02-02 12:14:41 +08:00
dailytip	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
data	Merge remote-tracking branch 'remote/master' into feature/merge_upstream	2023-04-19 08:48:07 +08:00
fonts	Add the full source of BambuStudio	2022-07-15 23:42:08 +08:00
handy_models	update OrcaCube v2	2023-04-06 15:38:08 +08:00
i18n	ENH: add cn translation for conflict check	2023-04-17 15:39:02 +08:00
images	Merge remote-tracking branch 'remote/master' into feature/merge_upstream	2023-04-19 08:48:07 +08:00
printers	ENH:add new prohibited materials	2023-04-17 15:39:02 +08:00
profiles	Merge remote-tracking branch 'remote/master' into feature/merge_upstream	2023-04-19 08:48:07 +08:00
shaders	ENH: refine the thumbnail rendering	2023-04-17 15:39:02 +08:00
tooltip	Merge remote-tracking branch 'remote/master' into feature/merge_upstream	2023-04-19 08:48:07 +08:00
web	Merge remote-tracking branch 'remote/master' into feature/merge_upstream	2023-04-19 08:48:07 +08:00
check_access_code.txt	ENH:Update IP address input process	2023-02-01 16:24:44 +08:00
config.json	ENH:optimize ams settings and virtual tray	2023-04-17 15:39:02 +08:00
Icon.icns	more logo fix	2023-03-17 21:05:54 +08:00