Merge branch 'development' into 1.1.4
Conflicts: MatterControl.sln
This commit is contained in:
commit
250458e12c
17 changed files with 74 additions and 102 deletions
|
|
@ -1,4 +1,5 @@
|
|||
baud_rate = 250000
|
||||
default_material_presets = ABS
|
||||
default_quality_preset = Balanced
|
||||
windows_driver = RAMBo.inf
|
||||
default_macros = Lights On, Lights Off
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
baud_rate = 250000
|
||||
default_material_presets = ABS
|
||||
default_quality_preset = Balanced
|
||||
windows_driver = RAMBo.inf
|
||||
default_macros = Lights On, Lights Off
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
baud_rate = 250000
|
||||
default_material_presets = PLA
|
||||
windows_driver = RAMBo.inf
|
||||
default_quality_preset = Balanced
|
||||
default_macros = Lights On, Lights Off
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
baud_rate = 250000
|
||||
default_material_presets = ABS
|
||||
default_quality_preset = Balanced
|
||||
windows_driver = RAMBo.inf
|
||||
default_macros = Lights On, Lights Off
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
baud_rate = 250000
|
||||
windows_driver = RAMBo.inf
|
||||
default_material_presets = ABS
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
baud_rate = 115200
|
||||
default_material_presets = ABS
|
||||
default_material_presets = ABS
|
||||
windows_driver = RAMBo.inf
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
baud_rate = 115200
|
||||
default_material_presets = PLA
|
||||
default_material_presets = PLA
|
||||
windows_driver = RAMBo.inf
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
baud_rate = 250000
|
||||
default_material_presets = PLA
|
||||
windows_driver = RAMBo.inf
|
||||
default_movement_speeds = x,3000,y,3000,z,3000,e0,3000
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
baud_rate = 250000
|
||||
default_material_presets = PLA
|
||||
windows_driver = RAMBo.inf
|
||||
default_movement_speeds = x,3000,y,3000,z,3000,e0,3000
|
||||
Loading…
Add table
Add a link
Reference in a new issue