35220 Commits

Author SHA1 Message Date
Erwan MATHIEU
2692b47405 Merge remote-tracking branch 'origin/CURA-12081_scarf-seam' into CURA-12081_scarf-seam 2024-08-26 08:04:43 +02:00
Erwan MATHIEU
a8df8a7103 Merge remote-tracking branch 'origin/main' into CURA-12081_scarf-seam 2024-08-26 08:04:03 +02:00
Erwan MATHIEU
e626284a88
Merge branch 'main' into CURA-12081_scarf-seam 2024-08-23 14:16:18 +02:00
Erwan MATHIEU
d92a9b4861 Add setting for seam acceleration/deceleration
CURA-12080
2024-08-23 13:58:56 +02:00
HellAholic
f8aa923ce0
Merge pull request #19555 from Ultimaker/CURA-12024-add_settable_globally_property
add settable_globally property
2024-08-23 12:21:29 +02:00
Erwan MATHIEU
9daca45846
Merge branch 'main' into CURA-12024-add_settable_globally_property 2024-08-22 10:28:26 +02:00
Erwan MATHIEU
758ff91655 Add setting for scarf seam split definition
CURA-12081
2024-08-22 09:24:51 +02:00
HellAholic
b12e6f9ff4
Merge pull request #19547 from Ultimaker/CURA-12096_move_gradual_flow_plugin_back_into_the_engine_core
CURA-12096 move gradual flow plugin back into the engine core
2024-08-21 12:04:19 +02:00
Erwan MATHIEU
7462de08cb Add settings for scarf seam
CURA-12081
2024-08-21 08:30:52 +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
08e61bdf3b
Merge pull request #19536 from Ultimaker/CURA-12046_git_tag_was_not_updated
CURA-12046 git tag was not updated
2024-08-19 13:20:56 +02:00
Erwan MATHIEU
3f6953c729 Merge branch 'CURA-12096_move_gradual_flow_plugin_back_into_the_engine_core' into CURA-12081_scarf-seam 2024-08-19 10:32:11 +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
HellAholic
c09fb02d52
Merge pull request #19446 from Hello1024/main
Add setting for extra_infill_lines_to_support_skins
2024-08-19 09:05:13 +02:00
Erwan MATHIEU
7591161ab9
Merge branch 'main' into CURA-12096_move_gradual_flow_plugin_back_into_the_engine_core 2024-08-16 16:25:36 +02:00
Erwan MATHIEU
c495527abd Merge remote-tracking branch 'origin/CURA-12096_move_gradual_flow_plugin_back_into_the_engine_core' into CURA-12096_move_gradual_flow_plugin_back_into_the_engine_core 2024-08-16 16:06:02 +02:00
Erwan MATHIEU
5a3ced550d Remove extra file cleaning in conanfile.py
CURA-12096

This was apparently only useful for the gradual flow plugin. Advised by @jellespijker.
2024-08-16 16:05:53 +02:00
wawanbreton
f6da4d0776 Applied printer-linter format 2024-08-16 13:17:18 +00:00
Erwan MATHIEU
3949b1a595 Move gradual flow translations into classic translations
CURA-12096
2024-08-16 15:15:50 +02:00
Erwan MATHIEU
b3d2707663 Rename gradual flow settings defined in profiles
CURA-12096
2024-08-16 14:59:49 +02:00
Erwan MATHIEU
5a4ce498d4 Remove gradual flow plugin dependency
CURA-12096
2024-08-16 14:57:58 +02:00
Erwan MATHIEU
08f7616294 Import gradual flow settings with classic ones
CURA-12096
2024-08-16 14:40:37 +02:00
HellAholic
6030d9f1a5
Merge pull request #19539 from Ultimaker/CURA-11501_switching_printers_loads_3rd_party_materials
CURA-11501 Fix excluded materials being sometimes visible
2024-08-16 14:19:51 +02:00
Erwan MATHIEU
785287ef9b Fix unit test
CURA-11501
2024-08-16 08:32:24 +02:00
Remco Burema
268fd354b2 Mark isExcludedMaterial as deprecated.
done as part of CURA-11501
2024-08-16 00:44:37 +02:00
Remco Burema
922c8ccbc9 Fix unit test.
It's not enough (or even nescesary) to mock the (now wrapper) method, since we use the underlaying method in our code now.

done as part of CURA-11501
2024-08-16 00:39:35 +02:00
Remco Burema
8805c6a1b5 Split methods to prevent API-break.
done as part of CURA-11501
2024-08-15 15:54:05 +02:00
Erwan MATHIEU
b8bba655ca Fix unit test 2024-08-15 11:54:29 +02:00
Erwan MATHIEU
1e5fa8523f Use proper method to check for excluded materials
CURA-11501
2024-08-15 11:13:15 +02:00
HellAholic
83fc0b764c
Merge pull request #19492 from Ultimaker/CURA-11957_sketch_fileformat_autoselect
[CURA-11957] Makerbot file formats don't just have 1 mime-type.
2024-08-14 13:51:26 +02:00
HellAholic
4cd80562c2
Merge pull request #19503 from Ultimaker/CURA-11956_slow_upload_big_timeout
[CURA-11956] The easy way to fix a slow response is to up the timeout...
2024-08-14 13:47:28 +02:00
Erwan MATHIEU
69bb462980 Fix outputting the main commit 2024-08-14 10:18:37 +02:00
Erwan MATHIEU
e63619d6f6 Fix script syntax 2024-08-14 09:00:21 +02:00
Erwan MATHIEU
7a944e94bb Get the proper commit to create the release 2024-08-14 08:55:51 +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
ce7743b7d6 Use only the relevant tag when creating a release candidate 2024-08-13 16:02:38 +02:00
Remco Burema
cd68dc2fe3
Merge branch 'main' into main 2024-08-13 15:57:09 +02:00
Erwan MATHIEU
da1f7edd01 Update the release tag if already existing 2024-08-13 15:43:52 +02:00
Erwan MATHIEU
7f16636ed9
Merge branch 'main' into CURA-11956_slow_upload_big_timeout 2024-08-12 17:17:15 +02:00
Erwan MATHIEU
0543c6f605
Merge branch 'main' into CURA-11957_sketch_fileformat_autoselect 2024-08-12 17:11:56 +02:00
Erwan MATHIEU
0d103c15e2
Merge pull request #19529 from Ultimaker/5.8
Update from 5.8 (added pt_BR translations lately)
2024-08-12 16:11:47 +02:00
Erwan MATHIEU
fec7637615
Merge branch 'main' into 5.8 2024-08-12 16:11:20 +02:00
Erwan MATHIEU
081b9b543b
Merge pull request #19422 from Patola/5.8
Updated pt_BR strings for Cura 5.8.
2024-08-12 16:09:15 +02:00
Oliver Mattos
ddba8fe8c1 Merge branch 'main' of github.com:Hello1024/Cura 2024-08-08 17:40:11 +01: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
608a775ccc Merge branch 'main' of github.com:Hello1024/Cura 2024-08-08 15:38:33 +01:00