3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Tim Kuipers 2016-02-29 16:40:11 +01:00
commit 36f8bb5553
14 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/machines/fdmprinter.json
View file

@ -588,7 +588,6 @@
"default": 10,
"min_value": "0",
"max_value_warning": "100",
"inherit_function": "10 if infill_sparse_density < 95 else 0",
"visible": false
},
"infill_wipe_dist": {

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

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines
infill_sparse_density = 22
infill_overlap = 0.022
infill_wipe_dist = 0.1
retraction_amount = 6
retraction_min_travel = 0.5

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

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines
infill_sparse_density = 18
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5

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

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines
infill_sparse_density = 22
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5

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

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines
infill_sparse_density = 20
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5

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

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines
infill_sparse_density = 25
infill_overlap = 0.035
infill_wipe_dist = 0.2
retraction_amount = 5.5
retraction_min_travel = 0.5

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

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines
infill_sparse_density = 20
infill_overlap = 0.053
infill_wipe_dist = 0.3
retraction_amount = 6
retraction_min_travel = 0.5

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

@ -15,7 +15,6 @@ travel_compensate_overlapping_walls_enabled = True
skin_no_small_gaps_heuristic = False
top_bottom_pattern = lines
infill_sparse_density = 20
infill_overlap = 0.07
infill_wipe_dist = 0.4
retraction_amount = 6
retraction_min_travel = 0.5

2
resources/qml/Cura.qml
View file

@ -667,7 +667,7 @@ UM.MainWindow
//TODO: Support multiple file selection, workaround bug in KDE file dialog
//selectMultiple: true
nameFilters: UM.MeshFileHandler.supportedReadFileTypes;
folder: Printer.getDefaultSavePath()
onAccepted:
{
//Because several implementations of the file dialog only update the folder