OrcaSlicer/resources
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
..
calib ENH: Add Ellis' pattern method for flow dynamic calibration 2023-09-22 16:21:26 +08:00
cert ENH: revert remove unused cert 2023-07-07 17:25:51 +08:00
dailytip Add the full source of BambuStudio 2022-07-15 23:42:08 +08:00
data Merge BS 1.7.7.89 2023-10-21 19:41:49 +08:00
fonts Revert "FIX: korean font display issue" 2023-09-22 16:21:26 +08:00
handy_models Merge branch 'v1.7.2-remote' 2023-09-29 19:46:49 +08:00
i18n ENH: add a text translation of a dailytip 2023-10-13 14:43:42 +08:00
images Merge branch 'v1.7.2-remote' 2023-09-29 19:46:49 +08:00
info ENH: use json to store filament & nozzle info 2023-10-13 14:43:42 +08:00
printers FIX: [STUDIO-3157] AMS material blacklist, prompt without translation 2023-07-07 17:29:08 +08:00
profiles Merge BS 1.7.7.89 2023-10-21 19:41:49 +08:00
shaders FIX:The mirrored patch normal vector needs to be reversed 2023-07-07 17:25:51 +08:00
tooltip post changes after merging BS1.7.4 2023-08-26 18:45:43 +08:00
web Merge BS 1.7.7.89 2023-10-21 19:41:49 +08:00
check_access_code.txt ENH:Update IP address input process 2023-02-01 16:24:44 +08:00
config.json NEW:Add config for C13 2023-09-22 16:21:26 +08:00
Icon.icns fix Mac icon 2023-09-08 00:41:23 +08:00