# Conflicts: # src/slic3r/GUI/SelectMachine.cpp
(cherry picked from commit bambulab/BambuStudio@9afe123026) --------- Co-authored-by: tao wang <tao.wang@bambulab.com>