juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-18 19:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into updating

Browse Source
This commit is contained in:
Vojtech Kral
2018-04-24 18:11:34 +02:00
parent fea5603409 ccd1c01d0b
commit a50bde4267
14 changed files with 280 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xs/src/slic3r/GUI/Tab.cpp
View File

@@ -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);