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
..
cs	update po file(tied my best...	2023-04-29 20:38:00 +08:00
de	Merge branch 'master-remote' 01.06.00.66	2023-05-01 10:21:08 +08:00
en	Merge branch 'master-remote' 01.06.00.66	2023-05-01 10:21:08 +08:00
es	update po file(tied my best...	2023-04-29 20:38:00 +08:00
fr	Merge branch 'master-remote' 01.06.00.66	2023-05-01 10:21:08 +08:00
hu	update po file(tied my best...	2023-04-29 20:38:00 +08:00
it	Merge branch 'master-remote' 01.06.00.66	2023-05-01 10:21:08 +08:00
ja	update po file(tied my best...	2023-04-29 20:38:00 +08:00
nl	update po file(tied my best...	2023-04-29 20:38:00 +08:00
sv	update po file(tied my best...	2023-04-29 20:38:00 +08:00
zh_cn	Merge branch 'master-remote' 01.06.00.66	2023-05-01 10:21:08 +08:00
list.txt	Merge remote-tracking branch 'remote/master' into feature/merge_upstream	2023-04-19 08:48:07 +08:00
OrcaSlicer.pot	update po file(tied my best...	2023-04-29 20:38:00 +08:00