15972 Commits

Author SHA1 Message Date
Theodor Hansson
1a85b7216e updated ZYYX settings version to 24 2024-10-03 20:55:36 +02:00
Theodor Hansson
462b072eb7 Merge remote-tracking branch 'origin/main' into zyyx_profile_addition
# Conflicts:
#	resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg
#	resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg
#	resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg
2024-10-03 20:48:03 +02:00
HellAholic
1d1ce9e29d
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu 2024-10-03 15:41:39 +02:00
Erwan MATHIEU
854858160e Fix wrong settings versions 2024-10-03 14:30:25 +02:00
Erwan MATHIEU
c6c4784338 Fix wrong settings versions 2024-10-03 14:14:39 +02:00
Erwan MATHIEU
f1874d1c2e
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu 2024-10-03 10:20:55 +02:00
alanbjorklund
a426f05096
Merge pull request #19701 from Ultimaker/PP-520-S-SL-Updates
PP-520 sketch & sketch large updates
2024-10-02 15:06:29 -04:00
Alan Bjorklund
5bd60d595a requested changes for sketch definition file and missing meshes
PP-511
2024-10-02 10:53:40 -04:00
theodorhansson
4dd60bdf06 Applied printer-linter format 2024-10-02 11:55:37 +00:00
Theodor Hansson
4817d0ae9a update settings version, remove line width 2024-10-02 13:54:47 +02:00
Theodor Hansson
e63a95b335 removed ZYYX Agile (and unused ZYYX+ variant file) 2024-10-02 11:30:49 +02:00
theodorhansson
1767bfd5fb Applied printer-linter format 2024-10-02 08:51:44 +00:00
Theodor Hansson
905ec496e7 removed temp from global profile 2024-10-02 10:50:55 +02:00
Theodor Hansson
f7ec7eec71 removed comment from flex profiles 2024-10-02 10:49:04 +02:00
theodorhansson
d93b53fdf1 Applied printer-linter format 2024-10-02 08:38:59 +00:00
Theodor Hansson
9466072682 ZYYX pro II fix broken profiles 2024-10-02 10:38:04 +02:00
Theodor Hansson
78bface21a
Merge branch 'Ultimaker:main' into zyyx_profile_addition 2024-10-02 10:20:45 +02:00
Theodor Hansson
c05dd2ad97 merge from theodorhansson/ZYYX-Cura-Printer-Profiles V3 2024-10-02 10:20:06 +02:00
Remco Burema
4b2026e718 Upgrader for 5.8 -> 5.9 version.
see jira ticket CURA-12097
2024-10-01 20:09:04 +02:00
alanbjorklund
b0d5b425b2 Applied printer-linter format 2024-10-01 02:45:24 +00:00
alanbjorklund
59278253a1
Update resources/definitions/ultimaker_sketch.def.json
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-09-30 22:44:03 -04:00
alanbjorklund
550741f5f1
Update resources/definitions/ultimaker_sketch.def.json
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-09-30 22:43:07 -04:00
Alan Bjorklund
3eb0b63024 adding sketch & sketch large files
PP-520
2024-09-30 22:29:05 -04:00
Erwan MATHIEU
ff1657305e
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu 2024-09-30 13:03:09 +02:00
HellAholic
c5348fa034
Merge pull request #19662 from Ultimaker/PP-324-Limit-buildplate-to-120C
PP-324 Hard limit iso warning on bed temperatures above 120C
2024-09-30 09:34:23 +02:00
pkuiper-ultimaker
4c1b70db67 Applied printer-linter format 2024-09-26 11:37:32 +00:00
Paul Kuiper
437613dcba Prevent abstract color profiles to be filtered out for machines that support them.
CURA-11634
2024-09-26 13:36:06 +02:00
Paul Kuiper
2c63e33b01 Prevent abstract color profiles to be filtered out for machines that support them.
CURA-11634
2024-09-26 13:35:55 +02:00
HellAholic
485b94fe06
Merge pull request #19621 from Ultimaker/PP-519_Update_printhead_size_for_Factor_4
PP-519 Update printhead size for Factor 4
2024-09-24 13:01:18 +02:00
HellAholic
efa91dd094
Update conandata.yml 2024-09-20 08:45:23 +02:00
HellAholic
4419c6b2cc Re-introduce the 0.2mm to prevent break 2024-09-19 13:13:15 +02:00
HellAholic
3b080f9d95
Merge branch 'main' into PP-512_Bad_print_quality_for_TPU_AA08_on_Factor_4 2024-09-19 11:34:52 +02:00
Erwan MATHIEU
f0cbd8e802 Restore lost change after an errored merge
This reverts commit 946bf033066e561827da4d00afbc3b680cd7e552.
2024-09-19 11:00:09 +02:00
Paul Kuiper
5bbb2fca65 Hard limit iso warning on bed temperatures above 120C
PP-324
2024-09-19 08:56:35 +02:00
rburema
b334717a11 Applied printer-linter format 2024-09-18 15:50:10 +00:00
Remco Burema
7928c241a8 Merge remote-tracking branch 'origin/5.8' 2024-09-18 17:31:27 +02:00
HellAholic
f736ead4c8
Merge pull request #19619 from Ultimaker/CURA-12093_conditional-start-end-gcode
CURA-12093 Add ability to write condition Start/End gcode parts
2024-09-16 09:13:12 +02:00
HellAholic
a0c111c6f5 Remove from menu 2024-09-12 11:03:07 +02:00
HellAholic
78394faf65 Remove from actions 2024-09-12 11:02:59 +02:00
Theodor Hansson
5b8cf6db1f lower vref for zyyx+ 2024-09-10 18:14:00 +02:00
Theodor Hansson
8eb4ccd968 update zyyx+ and pro definitions 2024-09-10 17:58:48 +02:00
Theodor Hansson
713b4fb57a removed accidental temp files 2024-09-10 17:54:59 +02:00
theodorhansson
579ab39412 Applied printer-linter format 2024-09-10 15:54:42 +00:00
Theodor Hansson
6f260fc474 updarte zyyx pro start gcode 2024-09-10 17:53:50 +02:00
theodorhansson
89dfd0690a Applied printer-linter format 2024-09-10 14:52:59 +00:00
Theodor Hansson
069dffc183 replace zyyx pla/abs with generic 2024-09-10 16:52:09 +02:00
theodorhansson
746eb613c4 Applied printer-linter format 2024-09-10 14:34:12 +00:00
Theodor Hansson
bda5123e7b merge error 2024-09-10 16:33:25 +02:00
Theodor Hansson
5536133b81 Merge branch 'zyyx_profile_addition' of https://github.com/theodorhansson/Cura into zyyx_profile_addition 2024-09-10 16:28:49 +02:00
Theodor Hansson
8ce584d65d fixed draft typo 2024-09-10 16:28:18 +02:00