From f8d5c2b1639e96402d9b941e9ed9fe46bcf714b7 Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Sat, 3 Aug 2024 12:48:11 +0200 Subject: [PATCH 1/3] feat(installer): add registry entry to provide silent uninstall --- packaging/NSIS/Ultimaker-Cura.nsi.jinja | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja index 0a2ce0f517..ac826af0d9 100644 --- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -133,6 +133,7 @@ CreateShortCut "$SMPROGRAMS\{{ app_name }}\UltiMaker Cura website.lnk" "$INSTDIR WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" +WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S' WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" From 8b614700d43a95583f34925f469e485f5ac9b0b8 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 7 Oct 2024 11:48:33 +0200 Subject: [PATCH 2/3] Update zyyx_pro_ii_carbon1.2.inst.cfg Remove legacy setting speed_equalize_flow_enabled has been removed from FDM printer in 5.0 with arachne --- resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg index 5fda710245..0145237bf4 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg @@ -45,7 +45,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = 20 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) From baefd3e4b63958955799e26dbbf6f8f59e66f9f7 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 7 Oct 2024 13:57:37 +0200 Subject: [PATCH 3/3] Excluded material from certain machines (e.g. PPS-CF and Nylon) --- resources/definitions/ultimaker2.def.json | 4 +++- resources/definitions/ultimaker3.def.json | 4 +++- resources/definitions/ultimaker_method.def.json | 1 + resources/definitions/ultimaker_original.def.json | 4 +++- resources/definitions/ultimaker_s3.def.json | 4 +++- resources/definitions/ultimaker_s5.def.json | 4 +++- resources/definitions/ultimaker_sketch_sprint.def.json | 3 +++ 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index d749c96a00..4564e4ba72 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -26,7 +26,9 @@ "ultimaker_petcf", "ultimaker_petg", "ultimaker_pva", - "ultimaker_tough_pla" + "ultimaker_tough_pla", + "generic_cffpps", + "ultimaker_ppscf" ], "firmware_file": "MarlinUltimaker2.hex", "has_machine_quality": true, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 9b732aa421..bd814cc79c 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -21,7 +21,9 @@ "generic_hips", "generic_petcf", "structur3d_", - "ultimaker_petcf" + "ultimaker_petcf", + "generic_cffpps", + "ultimaker_ppscf" ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index b55be7027a..ced7411148 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -44,6 +44,7 @@ "ultimaker_bvoh_175", "ultimaker_cffpa_175", "ultimaker_cpe_175", + "ultimaker_nylon_175", "ultimaker_hips_175", "ultimaker_pc_175", "ultimaker_tpu_175", diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 6848cb3c86..e7870129ed 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -25,7 +25,9 @@ "ultimaker_petcf", "ultimaker_petg", "ultimaker_pva", - "ultimaker_tough_pla" + "ultimaker_tough_pla", + "generic_cffpps", + "ultimaker_ppscf" ], "firmware_file": "MarlinUltimaker-{baudrate}.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 82776bd62e..76534f1609 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -17,7 +17,9 @@ "exclude_materials": [ "generic_hips", "generic_flexible", - "structur3d_" + "generic_cffpps", + "structur3d_", + "ultimaker_ppscf" ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 3bc3f7b50c..76a3e01773 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -18,7 +18,9 @@ "exclude_materials": [ "generic_hips", "generic_flexible", - "structur3d_" + "generic_cffpps", + "structur3d_", + "ultimaker_ppscf" ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index 44cb8ee875..fac4a8f75f 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -43,6 +43,9 @@ "octofiber_", "fiberlogy_", "generic_", + "basf_", + "jabil_", + "polymaker_", "ultimaker_asa", "ultimaker_abs", "ultimaker_nylon",