diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-07-17 11:44:23 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-07-17 11:44:23 +0300 |
| commit | 5c907469146767a44d90d8760efcf78e555379c9 (patch) | |
| tree | c7a273761920bf40f939f943dde1195b9c457313 /xs/src/slic3r/GUI/Tab.cpp | |
| parent | 8175c9d306b6e738788cd79334173b5f9b161662 (diff) | |
| parent | 161a2bc6f863e922c4b62b7d630b63d0fb7b75ad (diff) | |
Merge with master + resolved conflicts
Diffstat (limited to 'xs/src/slic3r/GUI/Tab.cpp')
| -rw-r--r-- | xs/src/slic3r/GUI/Tab.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp index 9831ac764..911ec0cbe 100644 --- a/xs/src/slic3r/GUI/Tab.cpp +++ b/xs/src/slic3r/GUI/Tab.cpp @@ -1292,6 +1292,10 @@ void TabFilament::build() optgroup->append_single_option_line("filament_loading_speed"); optgroup->append_single_option_line("filament_unloading_speed"); optgroup->append_single_option_line("filament_toolchange_delay"); + optgroup->append_single_option_line("filament_cooling_moves"); + optgroup->append_single_option_line("filament_cooling_initial_speed"); + optgroup->append_single_option_line("filament_cooling_final_speed"); + line = { _(L("Ramming")), "" }; line.widget = [this](wxWindow* parent){ auto ramming_dialog_btn = new wxButton(parent, wxID_ANY, _(L("Ramming settings"))+dots, wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); @@ -1806,6 +1810,7 @@ void TabPrinter::build_extruder_pages() optgroup->append_single_option_line("cooling_tube_retraction"); optgroup->append_single_option_line("cooling_tube_length"); optgroup->append_single_option_line("parking_pos_retraction"); + optgroup->append_single_option_line("extra_loading_move"); m_pages.insert(m_pages.end() - n_after_single_extruder_MM, page); m_has_single_extruder_MM_page = true; } @@ -1859,7 +1864,6 @@ void TabPrinter::build_extruder_pages() m_pages.begin() + n_before_extruders + m_extruders_count_old); m_extruders_count_old = m_extruders_count; - rebuild_page_tree(); } |