GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.6' into CURA-11262-Update-products-to-id.json

Browse Source
This commit is contained in:
c.lamboo 2023-11-06 14:35:36 +01:00
commit 4230f1f8b7
17 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/MakerbotWriter/MakerbotWriter.py
View File

@ -51,9 +51,9 @@ class MakerbotWriter(MeshWriter):
] ]
_META_VERSION = "3.0.0" _META_VERSION = "3.0.0"
_PRINT_NAME_MAP = { _PRINT_NAME_MAP = {
"Makerbot Method": "fire_e", "UltiMaker Method": "fire_e",
"Makerbot Method X": "lava_f", "UltiMaker Method X": "lava_f",
"Makerbot Method XL": "magma_10", "UltiMaker Method XL": "magma_10",
} }
_EXTRUDER_NAME_MAP = { _EXTRUDER_NAME_MAP = {
"1XA": "mk14_hot", "1XA": "mk14_hot",

4
resources/definitions/fdmprinter.def.json
View File

@ -7839,7 +7839,7 @@
"type": "float", "type": "float",
"minimum_value": "5", "minimum_value": "5",
"minimum_value_warning": "50", "minimum_value_warning": "50",
"maximum_value_warning": "150", "maximum_value_warning": "250",
"enabled": "bridge_settings_enabled", "enabled": "bridge_settings_enabled",
"settable_per_mesh": true "settable_per_mesh": true
}, },
@ -7866,7 +7866,7 @@
"type": "float", "type": "float",
"minimum_value": "5", "minimum_value": "5",
"minimum_value_warning": "50", "minimum_value_warning": "50",
"maximum_value_warning": "150", "maximum_value_warning": "250",
"enabled": "bridge_settings_enabled", "enabled": "bridge_settings_enabled",
"settable_per_mesh": true "settable_per_mesh": true
}, },

2
resources/definitions/ultimaker_method_base.def.json
View File

@ -329,7 +329,7 @@
"machine_heated_build_volume": { "default_value": true }, "machine_heated_build_volume": { "default_value": true },
"machine_height": { "default_value": 196 }, "machine_height": { "default_value": 196 },
"machine_min_cool_heat_time_window": { "value": 15 }, "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_cool_down_speed": { "value": 0.8 },
"machine_nozzle_heat_up_speed": { "value": 3.5 }, "machine_nozzle_heat_up_speed": { "value": 3.5 },
"machine_start_gcode": { "default_value": "" }, "machine_start_gcode": { "default_value": "" },

2
resources/definitions/ultimaker_methodx.def.json
View File

@ -83,6 +83,6 @@
}, },
"overrides": "overrides":
{ {
"machine_name": { "default_value": "Makerbot Method X" } "machine_name": { "default_value": "UltiMaker Method X" }
} }
} }

2
resources/definitions/ultimaker_methodxl.def.json
View File

@ -35,7 +35,7 @@
"machine_depth": { "default_value": 305 }, "machine_depth": { "default_value": 305 },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 317 }, "machine_height": { "default_value": 317 },
"machine_name": { "default_value": "Makerbot Method XL" }, "machine_name": { "default_value": "UltiMaker Method XL" },
"machine_width": { "default_value": 305 }, "machine_width": { "default_value": 305 },
"material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" },
"speed_travel": { "value": 500 } "speed_travel": { "value": 500 }

2
resources/intent/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm_solid.inst.cfg → resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg
View File

@ -9,7 +9,7 @@ material = ultimaker_abscf_175
quality_type = draft quality_type = draft
setting_version = 22 setting_version = 22
type = intent type = intent
variant = Lab variant = LABS
[values] [values]
infill_sparse_density = 100 infill_sparse_density = 100

2
resources/intent/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm_solid.inst.cfg → resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg
View File

@ -9,7 +9,7 @@ material = ultimaker_absr_175
quality_type = draft quality_type = draft
setting_version = 22 setting_version = 22
type = intent type = intent
variant = Lab variant = LABS
[values] [values]
infill_sparse_density = 100 infill_sparse_density = 100

2
resources/intent/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm_solid.inst.cfg → resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg
View File

@ -9,7 +9,7 @@ material = ultimaker_abscf_175
quality_type = draft quality_type = draft
setting_version = 22 setting_version = 22
type = intent type = intent
variant = Lab variant = LABS
[values] [values]
infill_sparse_density = 100 infill_sparse_density = 100

2
resources/intent/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm_solid.inst.cfg → resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg
View File

@ -9,7 +9,7 @@ material = ultimaker_absr_175
quality_type = draft quality_type = draft
setting_version = 22 setting_version = 22
type = intent type = intent
variant = Lab variant = LABS
[values] [values]
infill_sparse_density = 100 infill_sparse_density = 100

2
resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg → resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg
View File

@ -8,7 +8,7 @@ material = ultimaker_abscf_175
quality_type = draft quality_type = draft
setting_version = 22 setting_version = 22
type = quality type = quality
variant = Lab variant = LABS
weight = -2 weight = -2
[values] [values]

2
resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg → resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg
View File

@ -8,7 +8,7 @@ material = ultimaker_absr_175
quality_type = draft quality_type = draft
setting_version = 22 setting_version = 22
type = quality type = quality
variant = Lab variant = LABS
weight = -2 weight = -2
[values] [values]

2
resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg → resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg
View File

@ -8,7 +8,7 @@ material = ultimaker_abscf_175
quality_type = draft quality_type = draft
setting_version = 22 setting_version = 22
type = quality type = quality
variant = Lab variant = LABS
weight = -2 weight = -2
[values] [values]

2
resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg → resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg
View File

@ -8,7 +8,7 @@ material = ultimaker_absr_175
quality_type = draft quality_type = draft
setting_version = 22 setting_version = 22
type = quality type = quality
variant = Lab variant = LABS
weight = -2 weight = -2
[values] [values]

4
resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg
View File

@ -24,10 +24,10 @@ acceleration_topbottom = =acceleration_wall
acceleration_wall = =acceleration_infill acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500 acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall acceleration_wall_x = =acceleration_wall
bridge_skin_material_flow = 100 bridge_skin_material_flow = 200
bridge_skin_speed = =bridge_wall_speed bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50 bridge_sparse_infill_max_density = 50
bridge_wall_material_flow = 100 bridge_wall_material_flow = 200
bridge_wall_speed = 20 bridge_wall_speed = 20
cool_min_layer_time = 4 cool_min_layer_time = 4
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'

4
resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg
View File

@ -24,10 +24,10 @@ acceleration_topbottom = =acceleration_wall
acceleration_wall = =acceleration_infill acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500 acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall acceleration_wall_x = =acceleration_wall
bridge_skin_material_flow = 100 bridge_skin_material_flow = 200
bridge_skin_speed = =bridge_wall_speed bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50 bridge_sparse_infill_max_density = 50
bridge_wall_material_flow = 100 bridge_wall_material_flow = 200
bridge_wall_speed = 20 bridge_wall_speed = 20
cool_min_layer_time = 4 cool_min_layer_time = 4
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'

4
resources/variants/ultimaker_methodx_LAB.inst.cfg → resources/variants/ultimaker_methodx_LABS.inst.cfg
View File

@ -1,6 +1,6 @@
[general] [general]
definition = ultimaker_methodx definition = ultimaker_methodx
name = Lab name = LABS
version = 4 version = 4
[metadata] [metadata]
@ -9,6 +9,6 @@ setting_version = 22
type = variant type = variant
[values] [values]
machine_nozzle_id = Lab machine_nozzle_id = LABS
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4

4
resources/variants/ultimaker_methodxl_LAB.inst.cfg → resources/variants/ultimaker_methodxl_LABS.inst.cfg
View File

@ -1,6 +1,6 @@
[general] [general]
definition = ultimaker_methodxl definition = ultimaker_methodxl
name = Lab name = LABS
version = 4 version = 4
[metadata] [metadata]
@ -9,6 +9,6 @@ setting_version = 22
type = variant type = variant
[values] [values]
machine_nozzle_id = Lab machine_nozzle_id = LABS
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4