3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse source
This commit is contained in:
Tim Kuipers 2016-02-23 15:20:48 +01:00
commit 88ddf714c4
29 changed files with 493 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/machines/fdmprinter.json
View file

@ -1221,7 +1221,7 @@
"buildplate": "Touching Buildplate",
"everywhere": "Everywhere"
},
"default": "everywhere",
"default": "buildplate",
"enabled": "support_enable"
},
"support_angle": {
@ -1231,7 +1231,7 @@
"type": "float",
"min_value": "0",
"max_value": "90",
"default": 60,
"default": 50,
"visible": false,
"enabled": "support_enable"
},

10
resources/machines/ultimaker2plus_025.json
View file

@ -13,16 +13,6 @@
"overrides": {
"machine_nozzle_size": { "default": 0.25 },
"layer_height": { "default": 0.06 },
"layer_height_0": { "default": 0.15 },
"infill_sparse_density": { "default": 12 },
"speed_print": { "default": 30 },
"speed_wall": { "inherit_function": "parent_value / 30 * 20" },
"speed_wall_x": { "inherit_function": "speed_print / 30 * 25" },
"speed_topbottom": { "inherit_function": "parent_value / 30 * 20" },
"coasting_volume": { "default": 0.1 },
"coasting_min_volume": { "default": 0.17 }
}

5
resources/machines/ultimaker2plus_040.json
View file

@ -12,9 +12,6 @@
"variant": "0.4 mm",
"overrides": {
"machine_nozzle_size": { "default": 0.40 },
"wall_line_width_0": { "inherit_function": "parent_value * 0.875" },
"skin_line_width": { "inherit_function": "parent_value * 0.875" }
"machine_nozzle_size": { "default": 0.40 }
}
}

12
resources/machines/ultimaker2plus_060.json
View file

@ -13,18 +13,6 @@
"overrides": {
"machine_nozzle_size": { "default": 0.60 },
"layer_height": { "default": 0.15 },
"layer_height_0": { "default": 0.4 },
"shell_thickness": { "default": 1.8 },
"infill_sparse_density": { "default": 15 },
"speed_print": { "default": 55 },
"speed_wall": { "inherit_function": "parent_value / 55 * 25" },
"speed_wall_x": { "inherit_function": "speed_print / 55 * 40" },
"speed_topbottom": { "inherit_function": "parent_value / 55 * 20" },
"coasting_volume": { "default": 1.36 }
}
}

13
resources/machines/ultimaker2plus_080.json
View file

@ -13,19 +13,6 @@
"overrides": {
"machine_nozzle_size": { "default": 0.80 },
"layer_height": { "default": 0.2 },
"layer_height_0": { "default": 0.5 },
"shell_thickness": { "default": 2.4 },
"top_bottom_thickness": { "inherit_function": "parent_value / 2" },
"infill_sparse_density": { "default": 16 },
"speed_print": { "default": 40 },
"speed_wall": { "inherit_function": "parent_value / 40 * 20" },
"speed_wall_x": { "inherit_function": "speed_print / 40 * 30" },
"speed_topbottom": { "inherit_function": "parent_value / 40 * 20" },
"coasting_volume": { "default": 3.22 }
}
}