Erwan MATHIEU
a96eefd8cc
Fix duplicated file reloading
...
CURA-11905
Instead of using the object name for reloading meshes inside a 3MF file, use a dedicated mesh ID property that is only stored internally, doesn't have to be unique (because the combination filename+ID will be) and can't be changed by the user. This should improve 3MF file reloading, and also fixes reloading of duplicated instances, because multiple meshes can now have the same mesh ID.
2024-10-07 17:50:25 +02:00
HellAholic
96abc03fe6
Merge pull request #19632 from Ultimaker/PP-521_Fix_adhesion-type_resolve-logic
...
PP-521: Fix resolve logic for adhesion_type
2024-10-07 17:01:15 +02:00
HellAholic
b9344f29c5
Merge pull request #19644 from Ultimaker/CURA-12138-Export_for_support_option
...
Cura 12138 export for support option
2024-10-07 16:08:23 +02:00
HellAholic
faea6a20ed
Merge branch 'main' into CURA-12138-Export_for_support_option
2024-10-07 15:37:44 +02:00
HellAholic
2865836b8a
Change option name to Export Package For Technical Support
2024-10-07 15:22:47 +02:00
Erwan MATHIEU
058cf13535
Merge branch 'main' into PP-521_Fix_adhesion-type_resolve-logic
2024-10-07 15:09:35 +02:00
HellAholic
d7d51313ba
Merge pull request #19719 from Ultimaker/Update-exclude-material-list
...
Excluded material from certain machines (e.g. PPS-CF and Nylon)
2024-10-07 14:28:05 +02:00
Paul Kuiper
baefd3e4b6
Excluded material from certain machines (e.g. PPS-CF and Nylon)
2024-10-07 13:57:37 +02:00
Erwan MATHIEU
094ce230c4
Merge pull request #19718 from Ultimaker/zyyx_definition_update
...
Update zyyx_pro_ii_carbon1.2.inst.cfg
2024-10-07 12:02:51 +02:00
HellAholic
8b614700d4
Update zyyx_pro_ii_carbon1.2.inst.cfg
...
Remove legacy setting
speed_equalize_flow_enabled has been removed from FDM printer in 5.0 with arachne
2024-10-07 11:48:33 +02:00
HellAholic
b1c3532a5c
Merge pull request #19470 from Rotzbua/fest_silent_uninstall
...
feat(installer): add registry entry to provide silent uninstall
2024-10-07 11:03:53 +02:00
HellAholic
23fa935778
Merge branch 'main' into PP-521_Fix_adhesion-type_resolve-logic
2024-10-07 10:10:53 +02:00
HellAholic
d464f3930d
Applied printer-linter format
2024-10-07 08:09:50 +00:00
HellAholic
11c7c9b2aa
Merge pull request #18374 from theodorhansson/zyyx_profile_addition
...
Add definitions and profiles to ZYYX+, ZYYX Pro and ZYYX Pro ii
2024-10-07 10:08:57 +02:00
HellAholic
15033a512b
Merge branch 'main' into fest_silent_uninstall
2024-10-07 10:02:59 +02:00
HellAholic
449d81684e
Merge branch 'main' into zyyx_profile_addition
2024-10-07 09:53:52 +02:00
HellAholic
402940b09d
Merge pull request #19671 from solar138/patch-1
...
Typo fix in fdmprinter.def.json.pot
2024-10-07 09:22:08 +02:00
HellAholic
5d6d2f118a
Merge branch 'main' into CURA-12138-Export_for_support_option
2024-10-04 15:23:52 +02:00
HellAholic
bcf12d9347
Merge pull request #19709 from Ultimaker/Add-Sketch-printers
...
Adding Sketch printers
2024-10-04 15:19:28 +02:00
HellAholic
bf064e7768
Merge branch 'main' into Add-Sketch-printers
2024-10-04 14:59:26 +02:00
HellAholic
f3effc03f6
Merge pull request #19700 from Ultimaker/PP-511-Method-5-9-Rebased-Branded-Materials
...
PP-511 Method Labs Extruder Materials
2024-10-04 14:53:21 +02:00
HellAholic
6e8192a1f5
Merge branch 'main' into PP-511-Method-5-9-Rebased-Branded-Materials
2024-10-04 14:41:41 +02:00
HellAholic
92893b91ce
Merge pull request #19691 from Ultimaker/PP-511-Method-5-9-Rebased
...
Method(s) updates for 5.9
2024-10-04 14:36:47 +02:00
HellAholic
aa22343660
Merge branch 'main' into PP-511-Method-5-9-Rebased
2024-10-04 14:23:08 +02:00
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
