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

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

Browse source
This commit is contained in:
Jaime van Kessel 2023-11-07 12:47:11 +01:00
commit 0c78cdbdbd
No known key found for this signature in database
GPG key ID: C85F7A3AF1BAA7C4
35 changed files with 92 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1396,7 +1396,6 @@
{
"label": "Z Seam Relative",
"description": "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate.",
"unit": "mm",
"type": "bool",
"default_value": false,
"enabled": "z_seam_type == 'back'",
@ -7839,7 +7838,7 @@
"type": "float",
"minimum_value": "5",
"minimum_value_warning": "50",
"maximum_value_warning": "150",
"maximum_value_warning": "250",
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
@ -7866,7 +7865,7 @@
"type": "float",
"minimum_value": "5",
"minimum_value_warning": "50",
"maximum_value_warning": "150",
"maximum_value_warning": "250",
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},

8
resources/definitions/ultimaker_method_base.def.json
View file

@ -1,11 +1,11 @@
{
"version": 2,
"name": "Makerbot Method Base Profile",
"name": "UltiMaker Method Base Profile",
"inherits": "ultimaker",
"metadata":
{
"visible": false,
"author": "Ultimaker",
"author": "UltiMaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot",
"platform": "ultimaker_method_platform.stl",
@ -328,7 +328,7 @@
"machine_heated_build_volume": { "default_value": true },
"machine_height": { "default_value": 196 },
"machine_min_cool_heat_time_window": { "value": 15 },
"machine_name": { "default_value": "Makerbot Method" },
"machine_name": { "default_value": "UltiMaker Method" },
"machine_nozzle_cool_down_speed": { "value": 0.8 },
"machine_nozzle_heat_up_speed": { "value": 3.5 },
"machine_start_gcode": { "default_value": "" },
@ -348,7 +348,7 @@
"prime_blob_enable": { "enabled": false },
"prime_tower_base_curve_magnitude": { "value": 2 },
"prime_tower_base_height": { "value": 6 },
"prime_tower_base_size": { "value": 6 },
"prime_tower_base_size": { "value": 10 },
"prime_tower_enable": { "value": false },
"prime_tower_flow": { "value": "material_flow" },
"prime_tower_line_width": { "value": 1 },

6
resources/definitions/ultimaker_methodx.def.json
View file

@ -1,11 +1,11 @@
{
"version": 2,
"name": "Makerbot Method X",
"name": "UltiMaker Method X",
"inherits": "ultimaker_method_base",
"metadata":
{
"visible": true,
"author": "Ultimaker",
"author": "UltiMaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot",
"platform": "ultimaker_method_platform.stl",
@ -83,6 +83,6 @@
},
"overrides":
{
"machine_name": { "default_value": "Makerbot Method X" }
"machine_name": { "default_value": "UltiMaker Method X" }
}
}

6
resources/definitions/ultimaker_methodxl.def.json
View file

@ -1,11 +1,11 @@
{
"version": 2,
"name": "Makerbot Method XL",
"name": "UltiMaker Method XL",
"inherits": "ultimaker_methodx",
"metadata":
{
"visible": true,
"author": "Ultimaker",
"author": "UltiMaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot",
"platform": "ultimaker_method_xl_platform.stl",
@ -35,7 +35,7 @@
"machine_depth": { "default_value": 305 },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 317 },
"machine_name": { "default_value": "Makerbot Method XL" },
"machine_name": { "default_value": "UltiMaker Method XL" },
"machine_width": { "default_value": 305 },
"material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" },
"speed_travel": { "value": 500 }

4
resources/definitions/ultimaker_s3.def.json
View file

@ -1,11 +1,11 @@
{
"version": 2,
"name": "Ultimaker S3",
"name": "UltiMaker S3",
"inherits": "ultimaker",
"metadata":
{
"visible": true,
"author": "Ultimaker",
"author": "UltiMaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker_s3_platform.obj",

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

@ -1,11 +1,11 @@
{
"version": 2,
"name": "Ultimaker S5",
"name": "UltiMaker S5",
"inherits": "ultimaker",
"metadata":
{
"visible": true,
"author": "Ultimaker",
"author": "UltiMaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker_s5_platform.obj",

4
resources/definitions/ultimaker_s7.def.json
View file

@ -1,11 +1,11 @@
{
"version": 2,
"name": "Ultimaker S7",
"name": "UltiMaker S7",
"inherits": "ultimaker_s5",
"metadata":
{
"visible": true,
"author": "Ultimaker",
"author": "UltiMaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker_s7_platform.obj",