diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2018-04-24 19:11:34 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2018-04-24 19:11:34 +0300 |
| commit | a50bde4267ccadd4617b97b631a657ffaf8d6999 (patch) | |
| tree | 650bda0698d5b65a25827f8ef1c038c434ef0be6 /xs/src/slic3r/GUI/Tab.cpp | |
| parent | fea560340967e782849880079013014a32d3971c (diff) | |
| parent | ccd1c01d0b46354af7fe2a11a205ceee9f6c5a74 (diff) | |
Merge branch 'master' into updating
Diffstat (limited to 'xs/src/slic3r/GUI/Tab.cpp')
| -rw-r--r-- | xs/src/slic3r/GUI/Tab.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp index 38eb5e404..b7aaa78b7 100644 --- a/xs/src/slic3r/GUI/Tab.cpp +++ b/xs/src/slic3r/GUI/Tab.cpp @@ -1288,7 +1288,6 @@ 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_time"); line = { _(L("Ramming")), "" }; line.widget = [this](wxWindow* parent){ auto ramming_dialog_btn = new wxButton(parent, wxID_ANY, _(L("Ramming settings"))+"\u2026", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); |