SoftFever 260156648d Merge branch 'master-remote' into SoftFever ... # 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/nl/BambuStudio_nl.po # bbl/i18n/sv/BambuStudio_sv.po # 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/BBL.json # resources/profiles/Creality.json # resources/profiles/Voron.json # src/libslic3r/PrintConfig.cpp # src/libslic3r/TreeSupport.cpp # src/slic3r/GUI/DeviceManager.cpp # src/slic3r/GUI/ReleaseNote.cpp # version.inc		2022-12-31 15:15:58 +08:00
..
filament	fix profile syncing issue	2022-12-30 15:45:15 +08:00
machine	fix profile syncing issue	2022-12-30 15:45:15 +08:00
process	Merge branch 'master-remote' into SoftFever	2022-12-31 15:15:58 +08:00
hotend.stl	ENH: add preset for ender3 printer	2022-10-20 19:34:37 +08:00
voron_logo.png	ENH: add preset of voron	2022-10-20 19:34:37 +08:00
voron_v0_logo.png	ENH: add preset of voron	2022-10-20 19:34:37 +08:00