Merge branch 'main' into PP-521_Fix_adhesion-type_resolve-logic

Ultimaker · Oct 7, 2024 · 058cf13 · 058cf13
2 parents 23fa935 + d7d5131
commit 058cf13
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 6 deletions.
diff --git 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}"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -43,6 +43,9 @@
             "octofiber_",
             "fiberlogy_",
             "generic_",
+            "basf_",
+            "jabil_",
+            "polymaker_",
             "ultimaker_asa",
             "ultimaker_abs",
             "ultimaker_nylon",

diff --git 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)