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

Merge branch 'main' into Cura_ankermake_august

Browse source
This commit is contained in:
Saumya Jain 2024-03-15 09:21:04 +01:00 • committed by GitHub
commit 85866af3d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
75 changed files with 9810 additions and 1986 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@
{
"acceleration_print": { "default_value": 1000 },
"adhesion_type": { "default_value": "skirt" },
"brim_outside_only": { "default_value": false },
"brim_location": { "default_value": "everywhere" },
"default_material_print_temperature": { "default_value": 220 },
"infill_sparse_density": { "default_value": 20 },
"ironing_flow": { "default_value": 7.0 },

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

@ -6069,12 +6069,18 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"brim_outside_only":
"brim_location":
{
"label": "Brim Only on Outside",
"description": "Only print the brim on the outside of the model. This reduces the amount of brim you need to remove afterwards, while it doesn't reduce the bed adhesion that much.",
"type": "bool",
"default_value": true,
"label": "Brim Location",
"description": "Print a brim on the outside of the model, inside, or both. Depending on the model, this helps reducing the amount of brim you need to remove afterwards, while ensuring a proper bed adhesion.",
"type": "enum",
"options":
{
"outside": "Outside Only",
"inside": "Inside Only",
"everywhere": "Everywhere"
},
"default_value": "outside",
"enabled": "resolveOrValue('adhesion_type') == 'brim'",
"limit_to_extruder": "skirt_brim_extruder_nr",
"settable_per_mesh": false,
@ -6082,13 +6088,14 @@
},
"brim_inside_margin":
{
"label": "Brim Inside Avoid Margin",
"description": "A part fully enclosed inside another part can generate an outer brim that touches the inside of the other part. This removes all brim within this distance from internal holes.",
"label": "Brim Avoid Margin",
"description": "A brim around a model may touch an other model where you don't want it. This removes all brim within this distance from brimless models.",
"unit": "mm",
"type": "float",
"default_value": 2.5,
"value": "line_width * 4",
"default_value": "1.6",
"minimum_value": "0",
"enabled": "resolveOrValue('adhesion_type') == 'brim' and any(extruderValues('brim_outside_only'))",
"enabled": "resolveOrValue('adhesion_type') == 'brim'",
"limit_to_extruder": "skirt_brim_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
@ -6808,7 +6815,7 @@
"prime_tower_mode":
{
"label": "Prime Tower Type",
"description": "<html>How to generate the prime tower:<ul><li><b>Normal:</b> create a bucket in which secondary materials are primed</li><li><b>Interleaved:</b> create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.</li></ul></html>",
"description": "<html>How to generate the prime tower:<ul><li><b>Normal:</b> create a bucket in which secondary materials are primed</li><li><b>Interleaved:</b> create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other</li></ul></html>",
"type": "enum",
"value": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'",
"options":
@ -7294,7 +7301,7 @@
"user_defined_print_order_enabled":
{
"label": "Set Print Sequence Manually",
"description": "Allows to order the object list to set the print sequence manually. First object from the list will be printed first.",
"description": "Allows you to order the object list to manually set the print sequence. First object from the list will be printed first.",
"type": "bool",
"default_value": false,
"settable_per_mesh": false,

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

@ -113,7 +113,7 @@
"minimum_value_warning": "100"
},
"adhesion_type": { "value": "'skirt'" },
"brim_outside_only": { "value": false },
"brim_location": { "value": "everywhere" },
"cool_fan_speed_min": { "value": "0.5*cool_fan_speed" },
"cool_min_layer_time_fan_speed_max": { "value": 10 },
"default_material_bed_temperature": { "maximum_value": "150" },