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
..
data	Add TW localization in text.js (#2251)	2023-09-29 23:40:29 +08:00
guide	post changes after merging BS1.7.4	2023-08-26 18:45:43 +08:00
homepage	post changes after merging BS1.7.4	2023-08-26 18:45:43 +08:00
image	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
include	ENH: all fix about OnlineModels	2023-07-07 17:25:51 +08:00
login	change app color	2023-01-03 22:05:20 +08:00
model	post changes after merging BS1.7.4	2023-08-26 18:45:43 +08:00
orca	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00