HellAholic
c32a737308
Merge pull request #19571 from Ultimaker/CURA-12081_scarf-seam
...
CURA-12081 Scarf seam
2024-10-04 14:14:03 +02:00
Erwan MATHIEU
fe5c81a59c
Merge branch 'main' into CURA-12081_scarf-seam
2024-10-04 11:57:02 +02:00
Erwan MATHIEU
1d28f7d778
Move scarf seam and acceleration/deceleration to experimental
...
CURA-12077
2024-10-04 11:56:17 +02:00
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
157598fc1f
Merge branch 'main' into Add-Sketch-printers
2024-10-03 14:31:12 +02:00
Erwan MATHIEU
d17b77e1eb
Merge branch 'main' into CURA-12138-Export_for_support_option
2024-10-03 14:30:57 +02:00
Erwan MATHIEU
854858160e
Fix wrong settings versions
2024-10-03 14:30:25 +02:00
Erwan MATHIEU
9e478f602a
Merge branch 'main' into Add-Sketch-printers
2024-10-03 14:18:11 +02:00
Erwan MATHIEU
7779a4123a
Merge branch 'main' into CURA-12138-Export_for_support_option
2024-10-03 14:15:01 +02:00
Erwan MATHIEU
c6c4784338
Fix wrong settings versions
2024-10-03 14:14:39 +02:00
Erwan MATHIEU
e25c8f6bca
Fix incorrect definitions pointed out by unit test
...
CURA-12167
2024-10-03 14:03:26 +02:00
HellAholic
d770a183a1
Merge branch 'main' into CURA-12138-Export_for_support_option
2024-10-03 13:51:00 +02:00
Erwan MATHIEU
78be499aeb
Fix issues pointed out by linter
...
CURA-12167
2024-10-03 13:28:51 +02:00
Erwan MATHIEU
a2e0701492
Add mesh and texture for Sketch Sprint
...
CURA-12167
2024-10-03 13:21:17 +02:00
Paul Kuiper
83407e1331
Updating version number of Sketch quality files
2024-10-03 11:34:43 +02:00
Paul Kuiper
47551c4200
Sketch printer
2024-10-03 10:42:19 +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
Erwan MATHIEU
2c8e069e33
Update setting_version for 5.9
2024-10-03 09:16:05 +02:00
alanbjorklund
e86e111f00
Merge branch 'main' into PP-511-Method-5-9-Rebased-Branded-Materials
2024-10-02 17:19:53 -04:00
Alan Bjorklund
dca7d0cd3c
adding sketch / sketch large files after merging other PRs
...
PP-511
2024-10-02 17:18:11 -04: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
Erwan MATHIEU
adb57faa31
Merge branch 'main' into PP-511-Method-5-9-Rebased-Branded-Materials
2024-10-02 15:29:39 +02:00
Erwan MATHIEU
2de9e735cd
Update setting_version for 5.9
...
CURA-12165
2024-10-02 14:46:30 +02:00
Erwan MATHIEU
fec3f3ec37
Merge branch 'main' into PP-511-Method-5-9-Rebased
2024-10-02 14:21:06 +02: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
Paul Kuiper
4ea8bfd9bd
Update cura.json file to bundle the new material packages.
...
PP-511
2024-10-02 13:20:13 +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
Paul Kuiper
5561f65017
Adjusted start GCode formula Method machines to ensure the fan speed range stay within 0..1.
...
PP-511
2024-10-02 12:51:44 +02:00
pkuiper-ultimaker
806a2be60e
Applied printer-linter format
2024-10-02 10:43:35 +00:00
Paul Kuiper
6555f5c9ae
Update ultimaker_method_extruder_left.def.json
2024-10-02 12:42:39 +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
Erwan MATHIEU
88df1280f8
Add warning when changing the MATERIAL-MAP list
...
CURA-12165
2024-10-02 11:05:26 +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
