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
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
Erwan MATHIEU
da1f7edd01
Update the release tag if already existing
2024-08-13 15:43:52 +02:00
Erwan MATHIEU
ee65d93fb6
Merge branch 'main' into TIme-Lapse
2024-08-13 09:21:20 +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
Oliver Mattos
acf5a222cd
Adjust enable criteria and expand on description
2024-08-08 15:38:14 +01:00
Remco Burema
77e0d705db
The easy way to fix a slow response is to up the timeout.
...
This might on one hand have (other) consequences, and given the slowness we encounter not even be enough in some cases (may be related to the size of the messages?) May need to be fixed on server side.
attempt to adress CURA-11956
2024-08-07 18:04:18 +02: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
Remco Burema
8b47ce0315
Autoselect file-format: Split up long line and better documentation.
...
done as part of CURA-11957
2024-08-06 17:04:42 +02:00
Remco Burema
97ba9fb45f
Merge branch 'main' into CURA-11957_sketch_fileformat_autoselect
2024-08-06 16:34:11 +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
Remco Burema
1edc45f9ae
Builds: Unbump dulcificum version.
2024-08-06 16:23:27 +02:00
Remco Burema
89209f5f9a
Makerbot file formats don't just have 1 mimetype.
...
There are machines with other mime-types. Prepare for adding that one.
last step of CURA-11957 (otherwise solved by previous efforts)
2024-08-06 15:47:28 +02:00
Remco Burema
418c462df2
Merge pull request #19484 from Ultimaker/bump-to-5.9.0-alpha.1
...
Bump to 5.9.0-alpha.0
2024-08-06 14:25:30 +02:00
Remco Burema
5b9b26f28e
Merge branch 'main' into bump-to-5.9.0-alpha.1
2024-08-06 12:54:14 +02:00
