GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 03:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-10-07 15:09:35 +02:00 committed by GitHub
commit 058cf13535
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/NSIS/Ultimaker-Cura.nsi.jinja
View File

@ -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} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" 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}" "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}"

4
resources/definitions/ultimaker2.def.json
View File

@ -26,7 +26,9 @@
"ultimaker_petcf", "ultimaker_petcf",
"ultimaker_petg", "ultimaker_petg",
"ultimaker_pva", "ultimaker_pva",
"ultimaker_tough_pla" "ultimaker_tough_pla",
"generic_cffpps",
"ultimaker_ppscf"
], ],
"firmware_file": "MarlinUltimaker2.hex", "firmware_file": "MarlinUltimaker2.hex",
"has_machine_quality": true, "has_machine_quality": true,

4
resources/definitions/ultimaker3.def.json
View File

@ -21,7 +21,9 @@
"generic_hips", "generic_hips",
"generic_petcf", "generic_petcf",
"structur3d_", "structur3d_",
"ultimaker_petcf" "ultimaker_petcf",
"generic_cffpps",
"ultimaker_ppscf"
], ],
"firmware_update_info": "firmware_update_info":
{ {

1
resources/definitions/ultimaker_method.def.json
View File

@ -44,6 +44,7 @@
"ultimaker_bvoh_175", "ultimaker_bvoh_175",
"ultimaker_cffpa_175", "ultimaker_cffpa_175",
"ultimaker_cpe_175", "ultimaker_cpe_175",
"ultimaker_nylon_175",
"ultimaker_hips_175", "ultimaker_hips_175",
"ultimaker_pc_175", "ultimaker_pc_175",
"ultimaker_tpu_175", "ultimaker_tpu_175",

4
resources/definitions/ultimaker_original.def.json
View File

@ -25,7 +25,9 @@
"ultimaker_petcf", "ultimaker_petcf",
"ultimaker_petg", "ultimaker_petg",
"ultimaker_pva", "ultimaker_pva",
"ultimaker_tough_pla" "ultimaker_tough_pla",
"generic_cffpps",
"ultimaker_ppscf"
], ],
"firmware_file": "MarlinUltimaker-{baudrate}.hex", "firmware_file": "MarlinUltimaker-{baudrate}.hex",
"firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex",

4
resources/definitions/ultimaker_s3.def.json
View File

@ -17,7 +17,9 @@
"exclude_materials": [ "exclude_materials": [
"generic_hips", "generic_hips",
"generic_flexible", "generic_flexible",
"structur3d_" "generic_cffpps",
"structur3d_",
"ultimaker_ppscf"
], ],
"firmware_update_info": "firmware_update_info":
{ {

4
resources/definitions/ultimaker_s5.def.json
View File

@ -18,7 +18,9 @@
"exclude_materials": [ "exclude_materials": [
"generic_hips", "generic_hips",
"generic_flexible", "generic_flexible",
"structur3d_" "generic_cffpps",
"structur3d_",
"ultimaker_ppscf"
], ],
"firmware_update_info": "firmware_update_info":
{ {

3
resources/definitions/ultimaker_sketch_sprint.def.json
View File

@ -43,6 +43,9 @@
"octofiber_", "octofiber_",
"fiberlogy_", "fiberlogy_",
"generic_", "generic_",
"basf_",
"jabil_",
"polymaker_",
"ultimaker_asa", "ultimaker_asa",
"ultimaker_abs", "ultimaker_abs",
"ultimaker_nylon", "ultimaker_nylon",

1
resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg
View File

@ -45,7 +45,6 @@ retraction_hop = 2
retraction_hop_only_when_collides = True retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2 retraction_min_travel = =line_width * 2
skin_overlap = 5 skin_overlap = 5
speed_equalize_flow_enabled = True
speed_layer_0 = 20 speed_layer_0 = 20
speed_print = 35 speed_print = 35
speed_topbottom = =math.ceil(speed_print * 25 / 35) speed_topbottom = =math.ceil(speed_print * 25 / 35)