3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into CURA-11705-updating-strings-in-CURA

Browse source
This commit is contained in:
Saumya Jain 2024-03-08 14:46:04 +01:00 • committed by GitHub
commit 38685793ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/3MFWriter/SettingsExportModel.py
View file

@ -39,7 +39,7 @@ class SettingsExportModel(QObject):
'adaptive_layer_height_enabled',
'brim_gap',
'support_offset',
'brim_outside_only',
'brim_location',
'magic_spiralize',
'slicing_tolerance',
'outer_inset_first',

18
plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterWithConfigResponse.py
View file

@ -2,6 +2,8 @@
# Cura is released under the terms of the LGPLv3 or higher.
from typing import Optional, List
import uuid
from .CloudClusterResponse import CloudClusterResponse
from .ClusterPrinterStatus import ClusterPrinterStatus
@ -11,4 +13,20 @@ class CloudClusterWithConfigResponse(CloudClusterResponse):
def __init__(self, **kwargs) -> None:
self.configuration = self.parseModel(ClusterPrinterStatus, kwargs.get("host_printer"))
# Some printers will return a null UUID in the host_printer.uuid field. For those we can fall back using
# the host_guid field of the cluster data
valid_uuid = False
try:
parsed_uuid = uuid.UUID(self.configuration.uuid)
valid_uuid = parsed_uuid.int != 0
except:
pass
if not valid_uuid:
try:
self.configuration.uuid = kwargs.get("host_guid")
except:
pass
super().__init__(**kwargs)

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 },

25
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 surface may touch an other surface where brim is not expected. This removes all brim within this distance from brimless surfaces.",
"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

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" },

2
resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg
View file

@ -14,7 +14,7 @@ weight = 0
[values]
adhesion_type = brim
brim_line_count = 14
brim_outside_only = True
brim_location = outside
brim_width = 8
connect_infill_polygons = True
cool_fan_enabled = True

2
resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg
View file

@ -14,7 +14,7 @@ weight = 0
[values]
adhesion_type = brim
brim_line_count = 14
brim_outside_only = True
brim_location = outside
brim_width = 8
connect_infill_polygons = True
cool_fan_enabled = True

2
resources/setting_visibility/advanced.cfg
View file

@ -124,7 +124,7 @@ adhesion_extruder_nr
skirt_line_count
brim_width
brim_line_count
brim_outside_only
brim_location
[dual]
prime_tower_enable

2
resources/setting_visibility/expert.cfg
View file

@ -327,7 +327,7 @@ skirt_brim_minimal_length
brim_width
brim_gap
brim_line_count
brim_outside_only
brim_location
brim_smart_ordering
raft_margin
raft_smoothing