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
src/libslic3r

View file

@ -1614,7 +1614,7 @@ void PrintConfigDef::init_fff_params()
def->enum_labels.push_back(L("Use for time estimate"));
def->enum_labels.push_back(L("Ignore"));
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<MachineLimitsUsage>(MachineLimitsUsage::EmitToGCode));
def->set_default_value(new ConfigOptionEnum<MachineLimitsUsage>(MachineLimitsUsage::TimeEstimateOnly));
{
struct AxisDefault {