Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
YuSanka 2022-01-12 15:05:31 +01:00
commit ced6d26917
115 changed files with 434472 additions and 655 deletions

View file

@ -408,6 +408,7 @@ private:
bool m_has_single_extruder_MM_page = false;
bool m_use_silent_mode = false;
bool m_supports_travel_acceleration = false;
bool m_supports_min_feedrates = false;
void append_option_line(ConfigOptionsGroupShp optgroup, const std::string opt_key);
bool m_rebuild_kinematics_page = false;
ogStaticText* m_machine_limits_description_line {nullptr};