Erwan MATHIEU
|
9cebc21240
|
Merge branch '5.9' into ja-i18n-improve
|
2024-10-08 13:13:58 +02:00 |
|
Erwan MATHIEU
|
fa34d24528
|
Merge branch 'main' into ja-i18n-improve
|
2024-10-08 13:02:38 +02:00 |
|
wawanbreton
|
ef878993b3
|
Set conan package version 5.9.0-beta.1
|
2024-10-08 08:11:22 +00:00 |
|
wawanbreton
|
47acfc115a
|
Set conan package version 5.9.0-alpha.1
|
2024-10-08 08:07:39 +00: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
|
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 |
|
Paul Kuiper
|
baefd3e4b6
|
Excluded material from certain machines (e.g. PPS-CF and Nylon)
|
2024-10-07 13:57:37 +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
|
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
|
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
|
bf064e7768
|
Merge branch 'main' into Add-Sketch-printers
|
2024-10-04 14:59:26 +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
|
aa22343660
|
Merge branch 'main' into PP-511-Method-5-9-Rebased
|
2024-10-04 14:23:08 +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
|
1d1ce9e29d
|
Merge branch 'main' into CURA-11634-Show-Any-Color-in-color-submenu
|
2024-10-03 15:41:39 +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
|
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 |
|
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 |
|
Paul Kuiper
|
4ea8bfd9bd
|
Update cura.json file to bundle the new material packages.
PP-511
|
2024-10-02 13:20:13 +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 |
|
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 |
|