diff --git a/deps/+LibBGCode/LibBGCode.cmake b/deps/+LibBGCode/LibBGCode.cmake index 2a43a8ea06..8f2ead2585 100644 --- a/deps/+LibBGCode/LibBGCode.cmake +++ b/deps/+LibBGCode/LibBGCode.cmake @@ -1,8 +1,8 @@ set(LibBGCode_SOURCE_DIR "" CACHE PATH "Optionally specify local LibBGCode source directory") set(_source_dir_line - URL https://github.com/prusa3d/libbgcode/archive/a21254e7043b9a9e8f1c89a1d702912b36ad3d4c.zip - URL_HASH SHA256=4ce42e5b3129e3cb976d19c7c14ec8c708758297b27908b62657a57ac07e7fb5) + URL https://github.com/prusa3d/libbgcode/archive/d20e3a3a6d1ee3d8026bf20c5a9ce2ad88f4b433.zip + URL_HASH SHA256=bfcba51262bdda6f0bf06b9508f4386c50145d3e97bba6c76ee1f1520dae3b93) if (LibBGCode_SOURCE_DIR) set(_source_dir_line "SOURCE_DIR;${LibBGCode_SOURCE_DIR};BUILD_ALWAYS;ON") diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 8d42f03db2..d1323c8b31 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -957,7 +957,7 @@ void GCodeGenerator::_do_export(Print& print, GCodeOutputStream &file, Thumbnail // printer data - this section contains duplicates from the slicer metadata // that we just created. Find and copy the entries that we want to duplicate. const auto& slicer_metadata = binary_data.slicer_metadata.raw_data; - const std::vector keys_to_duplicate = { "printer_model", "filament_type", "filament_abrasive", "nozzle_diameter", "nozzle_high_flow", "nozzle_high_temperature", "bed_temperature", + const std::vector keys_to_duplicate = { "printer_model", "filament_type", "filament_abrasive", "nozzle_diameter", "nozzle_high_flow", "bed_temperature", "brim_width", "fill_density", "layer_height", "temperature", "ironing", "support_material", "extruder_colour"}; assert(std::is_sorted(slicer_metadata.begin(), slicer_metadata.end(), [](const auto& a, const auto& b) { return a.first < b.first; })); diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 54285ff25b..fe943d8cb8 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -533,7 +533,7 @@ static std::vector s_Preset_printer_options { "max_print_height", "default_print_profile", "inherits", "remaining_times", "silent_mode", "machine_limits_usage", "thumbnails", "thumbnails_format", - "nozzle_high_flow", "nozzle_high_temperature", + "nozzle_high_flow" }; static std::vector s_Preset_sla_print_options { diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 7bba2ea5ee..1bd340d165 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -128,7 +128,6 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n "gcode_comments", "gcode_label_objects", "nozzle_high_flow", - "nozzle_high_temperature", "infill_acceleration", "layer_gcode", "min_fan_speed", diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 58d8e722a3..ed3c5a74cf 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2562,12 +2562,6 @@ void PrintConfigDef::init_fff_params() def->mode = comExpert; def->set_default_value(new ConfigOptionBools{false}); - def = this->add("nozzle_high_temperature", coBools); - def->label = L("High temperature nozzle"); - def->tooltip = L("TODO"); - def->mode = comExpert; - def->set_default_value(new ConfigOptionBools{false}); - def = this->add("retract_lift", coFloats); def->label = L("Lift height"); def->tooltip = L("Lift height applied before travel."); @@ -3733,7 +3727,7 @@ void PrintConfigDef::init_extruder_option_keys() "retract_before_wipe", "retract_restart_extra", "retract_before_travel", "wipe", "travel_slope", "travel_max_lift", "travel_ramping_lift", "travel_lift_before_obstacle", "retract_layer_change", "retract_length_toolchange", "retract_restart_extra_toolchange", "extruder_colour", - "default_filament_profile", "nozzle_high_flow", "nozzle_high_temperature" + "default_filament_profile", "nozzle_high_flow" }; m_extruder_retract_keys = { diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 0a82f5e9c2..fb89debbd6 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -827,7 +827,6 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionFloats, travel_slope)) ((ConfigOptionBools, travel_lift_before_obstacle)) ((ConfigOptionBools, nozzle_high_flow)) - ((ConfigOptionBools, nozzle_high_temperature)) ((ConfigOptionPercents, retract_before_wipe)) ((ConfigOptionFloats, retract_length)) ((ConfigOptionFloats, retract_length_toolchange)) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index aa35aa9590..27ada926ff 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3133,7 +3133,7 @@ const std::vector extruder_options = { "retract_length", "retract_lift", "retract_lift_above", "retract_lift_below", "retract_speed", "deretract_speed", "retract_restart_extra", "retract_before_travel", "retract_layer_change", "wipe", "retract_before_wipe", "travel_ramping_lift", - "travel_slope", "travel_max_lift", "travel_lift_before_obstacle", "nozzle_high_flow", "nozzle_high_temperature", + "travel_slope", "travel_max_lift", "travel_lift_before_obstacle", "nozzle_high_flow", "retract_length_toolchange", "retract_restart_extra_toolchange", }; @@ -3197,8 +3197,6 @@ void TabPrinter::build_extruder_pages(size_t n_before_extruders) }; optgroup->append_single_option_line("nozzle_high_flow", "", extruder_idx); - optgroup->append_single_option_line("nozzle_high_temperature", "", extruder_idx); - optgroup = page->new_optgroup(L("Preview"));