3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-26 09:28:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'main' into main

Browse source
This commit is contained in:
HellAholic 2025-09-12 09:02:34 +02:00 • committed by GitHub
commit 08d0444d9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,8 +74,8 @@
{
"maximum_value": "max(35, min((material_bed_temperature + 20) / 2, 70))",
"maximum_value_warning": "max(30, min((material_bed_temperature + 10) / 2, 70))",
"minimum_value": "max((material_bed_temperature - 30) / 2, 30)",
"minimum_value_warning": "max((material_bed_temperature - 20) / 2, 30)"
"minimum_value": "max((material_bed_temperature - 40) / 1.5, 30)",
"minimum_value_warning": "max((material_bed_temperature - 35) / 1.5, 30)"
},
"cool_min_layer_time": { "value": 3 },
"cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 12" },
@ -86,6 +86,7 @@
"gantry_height": { "value": 35 },
"gradual_support_infill_steps": { "value": "3 if support_interface_enable and support_structure != 'tree' else 0" },
"group_outer_walls": { "value": "False" },
"infill_angles": { "value": "[-40, 50] if infill_pattern in ('grid', 'lines', 'zigzag') else [ ]" },
"infill_before_walls": { "value": "False if infill_sparse_density > 50 else True" },
"infill_enable_travel_optimization": { "value": "True" },
"infill_material_flow":
@ -94,7 +95,7 @@
"value": "(1 + (skin_material_flow-infill_sparse_density) / 100 if infill_sparse_density > skin_material_flow else 1) * material_flow"
},
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'triangles'" },
"infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'gyroid' if 15 < speed_infill / ( infill_line_width * 300 / infill_sparse_density ) < 25 else 'triangles'" },
"infill_sparse_density": { "maximum_value": "100" },
"infill_wipe_dist": { "value": "0" },
"inset_direction": { "value": "'inside_out'" },
@ -199,6 +200,7 @@
"value": "skin_material_flow"
},
"roofing_monotonic": { "value": "True" },
"skin_angles": { "value": "[-40, 50]" },
"skin_material_flow":
{
"maximum_value": "100",

3
resources/definitions/ultimaker_s8.def.json
View file

@ -387,6 +387,7 @@
"unit": "m/s\u00b3",
"value": "jerk_wall_0"
},
"keep_retracting_during_travel": { "enabled": false },
"machine_gcode_flavor": { "default_value": "Cheetah" },
"machine_max_acceleration_x": { "default_value": 50000 },
"machine_max_acceleration_y": { "default_value": 50000 },
@ -436,12 +437,14 @@
"meshfix_maximum_resolution": { "value": 0.4 },
"min_infill_area": { "default_value": 10 },
"optimize_wall_printing_order": { "value": false },
"prime_during_travel_ratio": { "enabled": false },
"prime_tower_brim_enable": { "value": true },
"prime_tower_min_volume": { "value": 10 },
"prime_tower_mode": { "resolve": "'normal'" },
"retraction_amount": { "value": 6.5 },
"retraction_combing_avoid_distance": { "value": 1.2 },
"retraction_combing_max_distance": { "value": 50 },
"retraction_during_travel_ratio": { "enabled": false },
"retraction_hop": { "value": 1 },
"retraction_hop_after_extruder_switch_height": { "value": 2 },
"retraction_hop_enabled": { "value": true },

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

@ -158,7 +158,7 @@
"machine_max_feedrate_z": { "default_value": 40 },
"machine_min_cool_heat_time_window": { "value": "15" },
"machine_name": { "default_value": "MakerBot Sketch Sprint" },
"machine_start_gcode": { "default_value": "G28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\nG1 Z0.25 F6000\nG1 E-1.5 F800\nG1 E2 F800\nG1 X111 Y111 Z0.25 F4800\nG1 X111 Y-111 E25 F1200" },
"machine_start_gcode": { "default_value": "G28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\nSET_SERVO SERVO=my_servo ANGLE=180\nSET_FAN_SPEED FAN=external_fan SPEED=1\nSET_FAN_SPEED FAN=internal_fan SPEED=1\nG1 Z0.25 F6000\nG1 E-1.5 F800\nG1 E2 F800\nG1 X111 Y111 Z0.25 F4800\nG1 X111 Y-111 E25 F1200" },
"machine_width": { "default_value": 221.5 },
"material_bed_temp_wait": { "value": "False" },
"material_bed_temperature":

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

@ -75,10 +75,6 @@
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
@ -186,9 +182,7 @@
"machine_extruder_trains": { "0": "zyyx_plus_extruder_0" },
"machine_x3g_variant": "z",
"preferred_material": "generic_pla",
"preferred_quality_type": "normal",
"quality_definition": "zyyx_plus",
"setting_version": 3
"preferred_quality_type": "normal"
},
"overrides":
{

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

@ -73,10 +73,6 @@
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
@ -185,8 +181,6 @@
"machine_x3g_variant": "z",
"preferred_material": "generic_pla",
"preferred_variant_name": "Carbon0.6",
"quality_definition": "zyyx_pro",
"setting_version": 3,
"variants_name": "SwiftTool"
},
"overrides":

1
resources/qml/WelcomePages/AddUltimakerPrinter.qml
View file

@ -129,7 +129,6 @@ Control
text: catalog.i18nc("@button", "Sign in to Digital Factory")
onClicked: function()
{
Qt.openUrlExternally("https://digitalfactory.ultimaker.com/app/printers?add_printer=true&utm_source=cura&utm_medium=software&utm_campaign=onboarding-add-printer")
text = catalog.i18nc("@button", "Waiting for new printers")
busy = true;
enabled = false;

8
resources/qml/WelcomePages/CloudContent.qml
View file

@ -210,7 +210,13 @@ Item
anchors.bottom: parent.bottom
text: catalog.i18nc("@button", "Sign in")
onClicked: Cura.API.account.login()
onClicked: function()
{
text = catalog.i18nc("@button", "Waiting for new printers")
busy = true;
enabled = false;
Cura.API.account.isLoggedIn? Cura.API.account.sync():Cura.API.account.login();
}
// Content Item is used in order to align the text inside the button. Without it, when resizing the
// button, the text will be aligned on the left
contentItem: Text {

5
resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg
View file

@ -13,4 +13,9 @@ variant = 0.4mm
weight = -3
[values]
bridge_wall_speed = 40
cool_min_layer_time_overhang = 12
cool_min_speed = 40
wall_overhang_angle = 30
wall_overhang_speed_factors = [60]

5
resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.2mm.inst.cfg
View file

@ -12,4 +12,9 @@ variant = 0.4mm
weight = -2
[values]
bridge_wall_speed = 40
cool_min_layer_time_overhang = 12
cool_min_speed = 40
wall_overhang_angle = 30
wall_overhang_speed_factors = [60]