Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PP-511 Method Labs Extruder Materials #19700

Merged
merged 21 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e4c4b04
Adding placeholders for new 3rd party materials in /bundled_packages/…
alanbjorklund Oct 1, 2024
aa3a9f3
update start gcode for method extruders, convert generic profiles int…
alanbjorklund Oct 1, 2024
4cf419b
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
5f11e20
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
efaa167
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
60a2ddd
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
5fe2fee
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
69c4a1b
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
a004e69
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
bedf2ef
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
49b5273
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
febc1eb
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
6f87a31
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
1eb04e7
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
14a44c7
Update resources/definitions/ultimaker_method_base.def.json
alanbjorklund Oct 1, 2024
b37e13d
reverted the method definition files to match master
alanbjorklund Oct 1, 2024
adb57fa
Merge branch 'main' into PP-511-Method-5-9-Rebased-Branded-Materials
wawanbreton Oct 2, 2024
dca7d0c
adding sketch / sketch large files after merging other PRs
alanbjorklund Oct 2, 2024
e86e111
Merge branch 'main' into PP-511-Method-5-9-Rebased-Branded-Materials
alanbjorklund Oct 2, 2024
2c8e069
Update setting_version for 5.9
wawanbreton Oct 3, 2024
6e8192a
Merge branch 'main' into PP-511-Method-5-9-Rebased-Branded-Materials
HellAholic Oct 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions resources/bundled_packages/cura.json
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,23 @@
}
}
},
"BASFUltrafuse316L": {
"package_info": {
"package_id": "BASFUltrafuse316L",
"package_type": "material",
"display_name": "BASF Ultrafuse 316L",
"description": "An innovative filament to produce 316L grade stainless steel parts.",
"package_version": "1.0.1",
"sdk_version": "8.6.0",
"website": "https://forward-am.com/material-portfolio/ultrafuse-filaments-for-fused-filaments-fabrication-fff/metal-filaments/ultrafuse-316l/",
"author": {
"author_id": "BASF",
"display_name": "BASF",
"email": null,
"website": "https://forward-am.com/"
}
}
},
"DagomaChromatikPLA": {
"package_info": {
"package_id": "DagomaChromatikPLA",
Expand Down Expand Up @@ -1582,6 +1599,23 @@
}
}
},
"JabilTPE_SEBS1300_95a": {
"package_info": {
"package_id": "JabilTPE_SEBS1300_95a",
"package_type": "material",
"display_name": "Jabil TPE SEBS 1300 95a",
"description": "Soft material great for prototyping where rubber-like or elastomeric properties and durability are required.",
"package_version": "1.0.1",
"sdk_version": "8.6.0",
"website": "https://www.jabil.com/services/additive-manufacturing/additive-materials/compare-filaments/tpe-sebs-95a.html",
"author": {
"author_id": "Jabil",
"display_name": "Jabil",
"email": null,
"website": "https://www.jabil.com/"
}
}
},
"OctofiberPLA": {
"package_info": {
"package_id": "OctofiberPLA",
Expand Down Expand Up @@ -1616,6 +1650,23 @@
}
}
},
"PolyMaxPC": {
"package_info": {
"package_id": "PolyMaxPC",
"package_type": "material",
"display_name": "PolyMax™ PC",
"description": "PolyMax™ PC is an engineered PC filament combining excellent strength, toughness, heat resistance and printing quality. It is the ideal choice for a wide range of engineering applications.",
"package_version": "1.0.1",
"sdk_version": "8.6.0",
"website": "http://www.polymaker.com/shop/polymax/",
"author": {
"author_id": "Polymaker",
"display_name": "Polymaker L.L.C.",
"email": "[email protected]",
"website": "https://www.polymaker.com"
}
}
},
"PolyMaxPLA": {
"package_info": {
"package_id": "PolyMaxPLA",
Expand Down
25 changes: 5 additions & 20 deletions resources/definitions/ultimaker_method.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,7 @@
"fabtotum_",
"fdplast_",
"filo3d_",
"generic_asa_175",
"generic_abs_175",
"generic_bvoh_175",
"generic_petg_175",
"generic_pla_175",
"generic_tough_pla_175",
"generic_pva_175",
"generic_cffpa_175",
"generic_cpe_175",
"generic_nylon_175",
"generic_hips_175",
"generic_pc_175",
"generic_tpu_175",
"generic_",
"goofoo_",
"ideagen3D_",
"imade3d_",
Expand All @@ -44,6 +32,7 @@
"leapfrog_",
"polyflex_pla",
"polymax_pla",
"polymaker_pc_175",
"polyplus_pla",
"polywood_pla",
"redd_",
Expand All @@ -53,23 +42,22 @@
"ultimaker_absr_175",
"ultimaker_abscf_175",
"ultimaker_bvoh_175",
"ultimaker_petg_175",
"ultimaker_cffpa_175",
"ultimaker_cpe_175",
"ultimaker_nylon_175",
"ultimaker_hips_175",
"ultimaker_pc_175",
"ultimaker_tpu_175",
"ultimaker_tough_pla_175",
"ultimaker_rapidrinse_175",
"ultimaker_sr30",
"ultimaker_metallic_pla_175",
"verbatim_",
"Vertex_",
"volumic_",
"xyzprinting_",
"zyyx_pro_",
"octofiber_",
"fiberlogy_"
"fiberlogy_",
"ultimaker_metallic_pla_175"
],
"has_machine_materials": true,
"has_machine_quality": true,
Expand Down Expand Up @@ -98,7 +86,6 @@
"overrides":
{
"build_volume_temperature": { "maximum_value": "67" },
"machine_depth": { "default_value": 236.48 },
"machine_disallowed_areas":
{
"default_value": [
Expand Down Expand Up @@ -128,9 +115,7 @@
]
]
},
"machine_height": { "default_value": 196 },
"machine_name": { "default_value": "UltiMaker Method" },
"machine_width": { "default_value": 283.3 },
"prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" },
"prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }
}
Expand Down
Loading
Loading