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
383c102a63
Merge pull request #19688 from Ultimaker/CURA-11634-Show-Any-Color-in-color-submenu
...
CURA-11634 Show any color in color submenu for machines that support it
2024-10-03 16:02:32 +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
HellAholic
ed6daa3735
Merge pull request #19083 from GregValiant/InsertAtLayerChange
...
Rewrite - Insert At Layer Change
2024-10-02 14:03:03 +02: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
HellAholic
1a7a5bcbbf
Merge pull request #19703 from Ultimaker/CURA-12097_upgrade_to_59
...
[CURA-12097] Upgrader for 5.8 -> 5.9 version.
2024-10-02 13:47:34 +02:00
Erwan MATHIEU
af467eb084
Merge branch 'main' into zyyx_profile_addition
2024-10-02 13:24:56 +02:00
Erwan MATHIEU
d2b3ca3896
Apply suggested changes
2024-10-02 13:07:45 +02:00
Remco Burema
e3211d4128
Make slicing work for the --external-backend option again.
2024-10-02 12:57:36 +02:00
Remco Burema
2e7450bbf3
Also check for 'abstract color' (support) when a single material is added.
...
Previously, this was only checked on 'load all' leading to some weird edge-ish cases where loading an any-color material on a printer that does support it, briefly also made it available on printers that (otherwise would, but) don't -- but only for that session.
part of CURA-12159 (also refer to CURA-11634)
2024-10-02 11:49:29 +02:00
Theodor Hansson
e63a95b335
removed ZYYX Agile (and unused ZYYX+ variant file)
2024-10-02 11:30:49 +02:00
HellAholic
766b87a6da
Merge pull request #18923 from GregValiant/TIme-Lapse
...
Re-write of Time Lapse
2024-10-02 11:11:55 +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
f3ba1902d8
Merge branch 'zyyx_profile_addition' of https://github.com/theodorhansson/Cura into zyyx_profile_addition
2024-10-02 10:20:16 +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
Erwan MATHIEU
7815715119
Merge branch 'main' into TIme-Lapse
2024-10-01 15:17:05 +02:00
Erwan MATHIEU
e4b4b8e4a4
Remove extra-spaces after units
2024-10-01 15:16:43 +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
d0080042ff
Slightly simplify code
...
CURA-11634
2024-09-30 13:10:37 +02: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
b471526607
Merge pull request #19683 from Ultimaker/CURA-6842_crash_when_renmaing_profiles
...
Add supress signals when renaming profiles
2024-09-30 10:52:43 +02:00
HellAholic
90945027aa
Merge pull request #19675 from Ultimaker/CURA-11103_display-message-file-too-big
...
CURA-11103 Handle message too big error when sending model data to engine
2024-09-30 10:35:03 +02:00
Erwan MATHIEU
1b06a44d68
Merge branch 'main' into InsertAtLayerChange
2024-09-30 09:58:08 +02:00
Erwan MATHIEU
b69038baa9
Merge branch 'main' into TIme-Lapse
2024-09-30 09:57:56 +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
Erwan MATHIEU
befbc32c1c
Merge branch 'main' into TIme-Lapse
2024-09-30 09:22:49 +02:00
Erwan MATHIEU
acd8444465
Merge branch 'main' into InsertAtLayerChange
2024-09-30 09:22:36 +02:00
Paul Kuiper
a8d2379674
Merge remote-tracking branch 'origin/CURA-11634-Show-Any-Color-in-color-submenu' into CURA-11634-Show-Any-Color-in-color-submenu
2024-09-26 14:51:43 +02:00
Paul Kuiper
99b6fd7616
Adjusted code to filter out the abstract colors per machine.
...
CURA-11634
2024-09-26 14:51:22 +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
Jaime van Kessel
eb963d7cbf
Add supress signals when renaming profiles
...
This fixes the situation where sometimes a signal was emitted while we were still
in the process of changing things
CURA-6842
2024-09-25 14:18:49 +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
