4996 Commits

Author SHA1 Message Date
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
Erwan MATHIEU
f1874d1c2e
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu 2024-10-03 10:20:55 +02:00
Alan Bjorklund
5bd60d595a requested changes for sketch definition file and missing meshes
PP-511
2024-10-02 10:53:40 -04:00
Theodor Hansson
e63a95b335 removed ZYYX Agile (and unused ZYYX+ variant file) 2024-10-02 11:30:49 +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
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
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
Remco Burema
7928c241a8 Merge remote-tracking branch 'origin/5.8' 2024-09-18 17:31:27 +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
Theodor Hansson
25b44e28be update and add zyyx qualities 2024-09-10 16:25:23 +02:00
theodorhansson
ba935f33ef Applied printer-linter format 2024-09-10 14:03:51 +00:00
Theodor Hansson
2ed1c88bd3 ZYYX+ disallow cf-filament 2024-09-10 16:03:04 +02:00
Theodor Hansson
22b337f329 Update ZYYX+ Homing 2024-09-10 16:02:39 +02:00
THeijmans
41bbf5a951 PP-519 Update printhead size for Factor 4 2024-09-06 10:41:19 +02:00
Theodor Hansson
5fba3cd161 Merge remote-tracking branch 'origin/main' into zyyx_profile_addition 2024-09-03 15:40:40 +02:00
HellAholic
aff3872893 Applied printer-linter format 2024-08-30 09:19:22 +00:00
HellAholic
7db3af745e
Merge branch 'main' into main 2024-08-30 11:18:25 +02:00
Erwan MATHIEU
9daca45846
Merge branch 'main' into CURA-12024-add_settable_globally_property 2024-08-22 10:28:26 +02:00
HellAholic
39a3966c6f
Merge branch 'main' into CURA-12096_move_gradual_flow_plugin_back_into_the_engine_core 2024-08-20 14:40:25 +02:00
HellAholic
c5c983b9c0 add settable_globally property
Not globally settable but the property was never defined either true or false
the value in the global stack is extruder.-1
2024-08-19 13:57:54 +02:00
HellAholic
0954c37b33
Merge pull request #19499 from Ultimaker/propose_spiralize_eazao
propose spiralize version of Eazao profiles
2024-08-19 09:07:01 +02:00
wawanbreton
f6da4d0776 Applied printer-linter format 2024-08-16 13:17:18 +00:00
Erwan MATHIEU
08f7616294 Import gradual flow settings with classic ones
CURA-12096
2024-08-16 14:40:37 +02:00
Remco Burema
ef38dc6b6b
Merge branch 'main' into propose_spiralize_eazao 2024-08-13 17:30:50 +02:00
rburema
4973eb625c Applied printer-linter format 2024-08-13 15:30:15 +00:00
Remco Burema
2428e6c741
Apply suggestions from code review
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-08-13 17:29:16 +02:00
Erwan MATHIEU
946bf03306 Revert "Merge branch 'main' into 5.8"
This reverts commit fec7637615fd05fb052848bb1cd569840d650ebd, reversing
changes made to 081b9b543b564ac6c2a840916162a06b289c5d94.
2024-08-13 15:56:01 +02:00
Oliver Mattos
dc4a92d960 A few more enable conditions for extra_infill_lines_to_support_skins 2024-08-08 17:39:58 +01:00
Oliver Mattos
9896e2eb96 Merge branch 'main' of github.com:Hello1024/Cura 2024-08-08 17:24:10 +01:00
Oliver Mattos
acf5a222cd Adjust enable criteria and expand on description 2024-08-08 15:38:14 +01:00
Remco Burema
5139da19aa
Merge branch 'main' into main 2024-08-07 14:11:28 +02:00
Remco Burema
8f46c17408 Help out PR: Set Eazao t/b pattern to concentric. 2024-08-07 10:13:01 +02:00
rburema
24aa10fd5e Applied printer-linter format 2024-08-07 08:00:11 +00:00
Remco Burema
1d9f049ff3 Helping out PR: Proposed change to Eazao (spiralized). 2024-08-07 09:27:05 +02:00
HellAholic
e3287a1c16
Merge pull request #19483 from Ultimaker/CURA-12069-Move_machine_nozzle_head_distance
Cura 12069 move machine nozzle head distance
2024-08-06 16:33:31 +02:00