3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Jaime van Kessel 2016-03-31 10:39:28 +02:00
commit effcbe5842
24 changed files with 299 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/machines/RigidBot.json
View file

@ -37,7 +37,6 @@
"overrides": { "overrides": {
"layer_height": { "default": 0.2 }, "layer_height": { "default": 0.2 },
"shell_thickness": { "default": 0.8 },
"wall_thickness": { "default": 0.8 }, "wall_thickness": { "default": 0.8 },
"top_bottom_thickness": { "default": 0.3, "visible": true }, "top_bottom_thickness": { "default": 0.3, "visible": true },
"material_print_temperature": { "default": 195, "visible": true }, "material_print_temperature": { "default": 195, "visible": true },

1
resources/machines/RigidBotBig.json
View file

@ -35,7 +35,6 @@
"overrides": { "overrides": {
"layer_height": { "default": 0.2 }, "layer_height": { "default": 0.2 },
"shell_thickness": { "default": 0.8},
"wall_thickness": { "default": 0.8 }, "wall_thickness": { "default": 0.8 },
"top_bottom_thickness": { "default": 0.3, "visible": true }, "top_bottom_thickness": { "default": 0.3, "visible": true },
"material_print_temperature": { "default": 195, "visible": true }, "material_print_temperature": { "default": 195, "visible": true },

1
resources/machines/bq_hephestos.json
View file

@ -40,7 +40,6 @@
"overrides": { "overrides": {
"layer_height": { "default": 0.2 }, "layer_height": { "default": 0.2 },
"layer_height_0": { "default": 0.2, "visible": false }, "layer_height_0": { "default": 0.2, "visible": false },
"shell_thickness": { "default": 1.0 },
"wall_thickness": { "default": 1.0, "visible": false }, "wall_thickness": { "default": 1.0, "visible": false },
"top_bottom_thickness": { "default": 1.0, "visible": false}, "top_bottom_thickness": { "default": 1.0, "visible": false},
"bottom_thickness": { "default": 1.0, "visible": false }, "bottom_thickness": { "default": 1.0, "visible": false },

1
resources/machines/bq_hephestos_2.json
View file

@ -43,7 +43,6 @@
"material_diameter": { "default": 1.75 }, "material_diameter": { "default": 1.75 },
"layer_height": { "default": 0.2 }, "layer_height": { "default": 0.2 },
"layer_height_0": { "default": 0.2, "visible": true }, "layer_height_0": { "default": 0.2, "visible": true },
"shell_thickness": { "default": 1.2 },
"wall_line_count": { "default": 3, "visible": false }, "wall_line_count": { "default": 3, "visible": false },
"wall_thickness": { "default": 1.2, "visible": false }, "wall_thickness": { "default": 1.2, "visible": false },
"top_bottom_thickness": { "default": 1.2, "visible": false }, "top_bottom_thickness": { "default": 1.2, "visible": false },

1
resources/machines/bq_hephestos_xl.json
View file

@ -40,7 +40,6 @@
"overrides": { "overrides": {
"layer_height": { "default": 0.2 }, "layer_height": { "default": 0.2 },
"layer_height_0": { "default": 0.2, "visible": false }, "layer_height_0": { "default": 0.2, "visible": false },
"shell_thickness": { "default": 1.0 },
"wall_thickness": { "default": 1.0, "visible": false }, "wall_thickness": { "default": 1.0, "visible": false },
"top_bottom_thickness": { "default": 1.0, "visible": false}, "top_bottom_thickness": { "default": 1.0, "visible": false},
"bottom_thickness": { "default": 1.0, "visible": false }, "bottom_thickness": { "default": 1.0, "visible": false },

1
resources/machines/bq_witbox.json
View file

@ -40,7 +40,6 @@
"overrides": { "overrides": {
"layer_height": { "default": 0.2 }, "layer_height": { "default": 0.2 },
"layer_height_0": { "default": 0.2, "visible": false }, "layer_height_0": { "default": 0.2, "visible": false },
"shell_thickness": { "default": 1.0 },
"wall_thickness": { "default": 1.0, "visible": false }, "wall_thickness": { "default": 1.0, "visible": false },
"top_bottom_thickness": { "default": 1.0, "visible": false}, "top_bottom_thickness": { "default": 1.0, "visible": false},
"bottom_thickness": { "default": 1.0, "visible": false }, "bottom_thickness": { "default": 1.0, "visible": false },

1
resources/machines/bq_witbox_2.json
View file

@ -43,7 +43,6 @@
"material_diameter": { "default": 1.75 }, "material_diameter": { "default": 1.75 },
"layer_height": { "default": 0.2 }, "layer_height": { "default": 0.2 },
"layer_height_0": { "default": 0.2, "visible": true }, "layer_height_0": { "default": 0.2, "visible": true },
"shell_thickness": { "default": 1.2 },
"wall_line_count": { "default": 3, "visible": false }, "wall_line_count": { "default": 3, "visible": false },
"wall_thickness": { "default": 1.2, "visible": false }, "wall_thickness": { "default": 1.2, "visible": false },
"top_bottom_thickness": { "default": 1.2, "visible": false }, "top_bottom_thickness": { "default": 1.2, "visible": false },

583
resources/machines/fdmprinter.json
View file

File diff suppressed because it is too large Load diff

1
resources/machines/innovo-inventor.json
View file

@ -30,7 +30,6 @@
"overrides": { "overrides": {
"layer_height": { "default": 0.15}, "layer_height": { "default": 0.15},
"shell_thickness": { "default": 0.8},
"wall_thickness": { "default": 0.8}, "wall_thickness": { "default": 0.8},
"top_bottom_thickness": { "default": 0.3, "visible": true}, "top_bottom_thickness": { "default": 0.3, "visible": true},
"material_print_temperature": { "default": 215, "visible": true}, "material_print_temperature": { "default": 215, "visible": true},

2
resources/profiles/general/Low+Quality.cfg
View file

@ -10,6 +10,6 @@ cool_min_layer_time = 3
speed_wall_0 = 40 speed_wall_0 = 40
speed_wall_x = 80 speed_wall_x = 80
speed_infill = 100 speed_infill = 100
shell_thickness = 1 wall_thickness = 1
speed_topbottom = 30 speed_topbottom = 30

2
resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
View file

@ -10,7 +10,7 @@ weight = -2
line_width = 0.22 line_width = 0.22
layer_height = 0.06 layer_height = 0.06
layer_height_0 = 0.15 layer_height_0 = 0.15
shell_thickness = 0.88 wall_thickness = 0.88
top_bottom_thickness = 0.72 top_bottom_thickness = 0.72
infill_sparse_density = 22 infill_sparse_density = 22
retraction_amount = 6 retraction_amount = 6

2
resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
View file

@ -10,7 +10,7 @@ weight = -1
line_width = 0.35 line_width = 0.35
layer_height = 0.15 layer_height = 0.15
layer_height_0 = 0.26 layer_height_0 = 0.26
shell_thickness = 0.7 wall_thickness = 0.7
top_bottom_thickness = 0.6 top_bottom_thickness = 0.6
infill_sparse_density = 18 infill_sparse_density = 18
retraction_amount = 5.5 retraction_amount = 5.5

2
resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
View file

@ -10,7 +10,7 @@ weight = -3
line_width = 0.35 line_width = 0.35
layer_height = 0.06 layer_height = 0.06
layer_height_0 = 0.26 layer_height_0 = 0.26
shell_thickness = 1.05 wall_thickness = 1.05
top_bottom_thickness = 0.84 top_bottom_thickness = 0.84
infill_sparse_density = 22 infill_sparse_density = 22
retraction_amount = 5.5 retraction_amount = 5.5

2
resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
View file

@ -9,7 +9,7 @@ weight = -2
[settings] [settings]
line_width = 0.35 line_width = 0.35
layer_height_0 = 0.26 layer_height_0 = 0.26
shell_thickness = 1.05 wall_thickness = 1.05
top_bottom_thickness = 0.8 top_bottom_thickness = 0.8
infill_sparse_density = 20 infill_sparse_density = 20
retraction_amount = 5.5 retraction_amount = 5.5

2
resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
View file

@ -10,7 +10,7 @@ weight = -4
line_width = 0.35 line_width = 0.35
layer_height = 0.04 layer_height = 0.04
layer_height_0 = 0.26 layer_height_0 = 0.26
shell_thickness = 1.4 wall_thickness = 1.4
top_bottom_thickness = 1.12 top_bottom_thickness = 1.12
infill_sparse_density = 25 infill_sparse_density = 25
retraction_amount = 5.5 retraction_amount = 5.5

2
resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
View file

@ -10,7 +10,7 @@ weight = -2
line_width = 0.53 line_width = 0.53
layer_height = 0.15 layer_height = 0.15
layer_height_0 = 0.4 layer_height_0 = 0.4
shell_thickness = 1.59 wall_thickness = 1.59
top_bottom_thickness = 1.2 top_bottom_thickness = 1.2
retraction_amount = 6 retraction_amount = 6
speed_print = 25 speed_print = 25

2
resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
View file

@ -10,7 +10,7 @@ weight = -2
line_width = 0.7 line_width = 0.7
layer_height = 0.2 layer_height = 0.2
layer_height_0 = 0.5 layer_height_0 = 0.5
shell_thickness = 2.1 wall_thickness = 2.1
top_bottom_thickness = 1.6 top_bottom_thickness = 1.6
infill_sparse_density = 20 infill_sparse_density = 20
retraction_amount = 6 retraction_amount = 6

2
resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
View file

@ -9,7 +9,7 @@ weight = -2
line_width = 0.22 line_width = 0.22
layer_height = 0.06 layer_height = 0.06
layer_height_0 = 0.15 layer_height_0 = 0.15
shell_thickness = 0.88 wall_thickness = 0.88
top_bottom_thickness = 0.72 top_bottom_thickness = 0.72
infill_sparse_density = 22 infill_sparse_density = 22
infill_overlap = 0.022 infill_overlap = 0.022

2
resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
View file

@ -9,7 +9,7 @@ weight = -1
line_width = 0.35 line_width = 0.35
layer_height = 0.15 layer_height = 0.15
layer_height_0 = 0.26 layer_height_0 = 0.26
shell_thickness = 0.7 wall_thickness = 0.7
top_bottom_thickness = 0.6 top_bottom_thickness = 0.6
infill_sparse_density = 18 infill_sparse_density = 18
infill_overlap = 0.035 infill_overlap = 0.035

2
resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
View file

@ -9,7 +9,7 @@ weight = -3
line_width = 0.35 line_width = 0.35
layer_height = 0.06 layer_height = 0.06
layer_height_0 = 0.26 layer_height_0 = 0.26
shell_thickness = 1.05 wall_thickness = 1.05
top_bottom_thickness = 0.84 top_bottom_thickness = 0.84
infill_sparse_density = 22 infill_sparse_density = 22
infill_overlap = 0.035 infill_overlap = 0.035

2
resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
View file

@ -9,7 +9,7 @@ weight = -2
line_width = 0.35 line_width = 0.35
layer_height = 0.1 layer_height = 0.1
layer_height_0 = 0.26 layer_height_0 = 0.26
shell_thickness = 1.05 wall_thickness = 1.05
top_bottom_thickness = 0.8 top_bottom_thickness = 0.8
infill_overlap = 0.035 infill_overlap = 0.035
retraction_amount = 5.5 retraction_amount = 5.5

2
resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
View file

@ -9,7 +9,7 @@ weight = -4
line_width = 0.35 line_width = 0.35
layer_height = 0.04 layer_height = 0.04
layer_height_0 = 0.26 layer_height_0 = 0.26
shell_thickness = 1.4 wall_thickness = 1.4
top_bottom_thickness = 1.12 top_bottom_thickness = 1.12
infill_sparse_density = 25 infill_sparse_density = 25
infill_overlap = 0.035 infill_overlap = 0.035

2
resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
View file

@ -9,7 +9,7 @@ weight = -2
line_width = 0.53 line_width = 0.53
layer_height = 0.15 layer_height = 0.15
layer_height_0 = 0.4 layer_height_0 = 0.4
shell_thickness = 1.59 wall_thickness = 1.59
top_bottom_thickness = 1.2 top_bottom_thickness = 1.2
infill_overlap = 0.053 infill_overlap = 0.053
retraction_amount = 6 retraction_amount = 6

2
resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
View file

@ -9,7 +9,7 @@ weight = -2
line_width = 0.7 line_width = 0.7
layer_height = 0.2 layer_height = 0.2
layer_height_0 = 0.5 layer_height_0 = 0.5
shell_thickness = 2.1 wall_thickness = 2.1
top_bottom_thickness = 1.6 top_bottom_thickness = 1.6
infill_sparse_density = 20 infill_sparse_density = 20
infill_overlap = 0.07 infill_overlap = 0.07