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

Merge branch 'master' of ssh://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Ghostkeeper 2019-10-18 16:53:08 +02:00
commit b24dad1563
No known key found for this signature in database
GPG key ID: 59A4C0959592C05C
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -107,7 +107,8 @@ class StartSliceJob(Job):
return False
# if there are no per-object settings we don't need to check the other settings here
if stack.getTop() is None or not stack.getTop().getAllKeys():
stack_top = stack.getTop()
if stack_top is None or not stack_top.getAllKeys():
return False
for key in stack.getAllKeys():

12
resources/definitions/fdmprinter.def.json
View file

@ -1190,6 +1190,18 @@
"value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
"initial_bottom_layers":
{
"label": "Initial Bottom Layers",
"description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.",
"minimum_value": "0",
"minimum_value_warning": "2",
"default_value": 6,
"type": "int",
"value": "bottom_layers",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
}
}
}

2
resources/definitions/ultimaker_s5.def.json
View file

@ -70,8 +70,6 @@
"extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" },
"machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "value": "345" },
"prime_tower_position_y": { "value": "222.5" },
"prime_blob_enable": { "enabled": true, "default_value": false },
"speed_travel":