SoftFever 54c02521d4 Merge branch 'master-remote' 01.06.00.66 ... # Conflicts: # .github/workflows/build_ubuntu.yml # 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/i18n/zh_cn/BambuStudio.mo # version.inc		2023-05-01 10:21:08 +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	update po file(tied my best...	2023-04-29 20:38:00 +08:00
images	Merge branch 'master-remote' 01.06.00.66	2023-05-01 10:21:08 +08:00
printers	ENH:add new prohibited materials	2023-04-17 15:39:02 +08:00
profiles	change to multi-plate friendly bed model for Flsun V400	2023-04-29 10:30:43 +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 pull request #873 from fr3ak2402/main	2023-04-29 10:30:42 +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