3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '2.1'

Browse source 
Conflicts:
	plugins/CuraEngineBackend/StartSliceJob.py
This commit is contained in:
Ghostkeeper 2016-05-04 13:43:35 +02:00
commit 4ef9c1a3e7
4 changed files with 84 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/machines/ultimaker2_extended_plus.json
View file

@ -11,7 +11,7 @@
"inherits": "ultimaker2plus.json",
"machine_settings": {
"machine_height": { "default": 313 },
"machine_height": { "default": 305},
"machine_show_variants": { "default": true },
"machine_nozzle_head_distance": { "default": 5 },
"machine_nozzle_expansion_angle": { "default": 45 }

1
resources/machines/ultimaker2plus.json
View file

@ -17,7 +17,6 @@
"line_width": { "inherit_function": "round(machine_nozzle_size * 0.875, 2)" },
"speed_layer_0": { "default": "20" },
"speed_support": { "inherit_function": "speed_wall_0" },
"machine_height": { "default": 203 },
"machine_show_variants": { "default": true },
"gantry_height": { "default": 52 },
"machine_nozzle_head_distance": { "default": 5 },