Merge remote-tracking branch 'origin/master' into new_main_page_ui

This commit is contained in:
YuSanka committed 2018-05-24 08:32:24 +02:00
commit 85508fab82
15 files changed
+7984 -4804

No files matched your search

Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
File diff suppressed because it is too large. Load diff
Binary file not shown.
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -546,7 +546,7 @@ filament_cost = 0
filament_density = 0
filament_diameter = 1.75
filament_notes = ""
filament_settings_id =
filament_settings_id = ""
filament_soluble = 0
min_print_speed = 15
slowdown_below_layer_time = 20