SoftFever 59bab91da9 Merge branch 'merge-upstream' ... Signed-off-by: SoftFever <softfeverever@gmail.com> # Conflicts: # src/libslic3r/Preset.cpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp		2023-09-30 09:51:56 +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 remote-tracking branch 'remote/master' into feature/merge_upstream	2023-04-19 08:48:07 +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	FIX: translate for error message when send calib	2023-09-22 16:21:26 +08:00
images	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
printers	FIX: [STUDIO-3157] AMS material blacklist, prompt without translation	2023-07-07 17:29:08 +08:00
profiles	Merge branch 'merge-upstream'	2023-09-30 09:51:56 +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 branch 'merge-upstream'	2023-09-30 09:51:56 +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