SoftFever 1a4f028f32 Merge branch 'SoftFever' ... # Conflicts: # bbl/i18n/OrcaSlicer.pot # bbl/i18n/cs/OrcaSlicer_cs.po # 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 # version.inc		2023-04-29 20:13:03 +08:00
..
i18n	Merge branch 'SoftFever'	2023-04-29 20:13:03 +08:00