34820 Commits

Author SHA1 Message Date
Saumya Jain
e0635f1f05
Merge pull request #17607 from AnkerBinary-Liu/Cura_ankermake_august
fix: add a new machine named M5C for ankermake
2024-05-03 10:14:51 +02:00
Saumya Jain
4379a00b41
Merge branch 'main' into main 2024-05-03 10:05:25 +02:00
Paul Kuiper
a77eabf34f Added PPS-CF as bundled package.
PP-476
2024-05-02 18:59:48 +02:00
Jelle Spijker
b12f7e0ff6
Update conan-package workflows to use specific branch
Conan-package workflows in both 'conan-package.yml' and 'conan-package-resources.yml' have been updated to use a specific branch ('NP-186_seperate_cura_resources') instead of 'main'. Further adjustments will be needed after the branch merge. Also, 'conan_recipe_root' attribute was added in 'conan-package-resources.yml'.

Contribute to NP-186
2024-05-02 13:52:06 +02:00
Saumya Jain
d7ffaab0d0
Merge branch 'main' into CURA-11227-zseam-support 2024-05-01 10:03:45 +02:00
Jelle Spijker
39b48d6f69
Add Conanfile for Cura resources and Git workflows
Added a new Conanfile for handling Cura resources which includes definitions, extruders, intent, meshes, quality, and variants. Also, updated the `.github/workflows/conan-package.yml` for specific paths and added a new GitHub workflow `conan-package-resources.yml` for handling the packaging of resources.

Contribute to NP-186
2024-04-30 18:06:29 +02:00
Saumya Jain
f3172cb10b Removes the maximum_value line and modifies the maximum_value_warning from "line_width * 2" to "line_width * 4".
CURA-11227
2024-04-29 14:48:27 +02:00
august.chi
b4c626484f Based on the reviewer's feedback, I have made some changes:delete material params
Signed-off-by: august.chi <august.chi@anker-in.com>
2024-04-28 10:22:46 +08:00
augustchi
fd8f5fccb2
Merge branch 'Ultimaker:main' into Cura_ankermake_august 2024-04-28 09:43:51 +08:00
Saumya Jain
fb965b8d0c merge 5.7 2024-04-26 15:53:03 +02:00
HellAholic
6e12e14e0a
Merge pull request #18827 from Ultimaker/CURA-10901-warn-if-formulas-are-NOK
Add Formulas linter and integrate with factory
2024-04-26 13:09:24 +02:00
Saumya Jain
052b1c7ece
Merge branch 'main' into CURA-11227-zseam-support 2024-04-26 12:22:31 +02:00
Saumya Jain
284f8e2d6d
Merge branch 'main' into CURA-10901-warn-if-formulas-are-NOK 2024-04-26 12:08:12 +02:00
HellAholic
c7b3a765ea
Merge pull request #18945 from Ultimaker/CURA-11153
Add new linter for long profile names
2024-04-26 11:50:59 +02:00
HellAholic
fdc2688413
Update printer-linter/src/printerlinter/linters/profile.py 2024-04-26 11:49:54 +02:00
HellAholic
4495f64753 Revert "Update printer-linter/src/printerlinter/linters/profile.py"
This reverts commit d6164fddaec6fa83e6cd39220c927d855c7ec2bc.
2024-04-26 11:39:39 +02:00
HellAholic
d6164fddae
Update printer-linter/src/printerlinter/linters/profile.py 2024-04-26 11:36:12 +02:00
Saumya Jain
ec6c7f109c
removed non necessary yield 2024-04-26 10:29:42 +02:00
Saumya Jain
467801bf9e
Apply suggestions from code review
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-04-26 10:26:52 +02:00
Casper Lamboo
7db39ae11d
Merge pull request #18949 from Ultimaker/CURA-11854_fix_intent_selection
Improve currentIntentCategory logic
5.7.1
2024-04-24 13:24:26 +02:00
Casper Lamboo
6ee91c59d7
Merge branch '5.7' into CURA-11854_fix_intent_selection 2024-04-24 13:19:25 +02:00
Jaime van Kessel
a5a25f676e
Improve currentIntentCategory logic
CURA-11854
2024-04-24 13:15:21 +02:00
Saumya Jain
0ce09d917c message has profile name in bold
CURA-11153
2024-04-24 11:01:30 +02:00
Saumya Jain
56aad519ae Changed message
CURA-11153
2024-04-24 10:59:36 +02:00
Saumya Jain
196a4cf0c0 Refactor profile name check method in linter
CURA-11153
2024-04-24 10:51:48 +02:00
Casper Lamboo
f86d63b513
Merge pull request #18946 from Ultimaker/CURA-11854_fix_intent_selection
Fix intent selection
2024-04-24 10:45:46 +02:00
Jaime van Kessel
600cd7669c
Use the activeIntent from intentmanager instead of active stack
Otherwise the behavior of the model changes depending on what stack you
have active. I think that this was caused by some code duplication where one
copy of the code was updated but not the other one. This bug was here for quite
some time, but strangely enough, it was never found...

CURA-11854
2024-04-24 10:34:33 +02:00
Saumya Jain
ceb5e7096e Add new linter for long profile names
CURA-11153
2024-04-24 10:32:29 +02:00
HellAholic
f98bdd09f7
Merge pull request #18940 from Ultimaker/F4_Monitor_page_image
Added missing Ultimaker Factor 4.png image
2024-04-23 16:07:13 +02:00
HellAholic
ea55d2190c Create Ultimaker Factor 4.png 2024-04-23 15:59:18 +02:00
Saumya Jain
3e1ee4b266 Updated shader for support seams
Added changes in shader to show the start of the support walls too along with the model walls

CURA-11227
2024-04-23 14:28:35 +02:00
Casper Lamboo
6d3636558e
Merge pull request #18936 from Ultimaker/CURA-11840_Update_Changelog_571
CURA-11840 update changelog 571
2024-04-22 14:56:50 +02:00
Casper Lamboo
112003db03
Merge pull request #18933 from Ultimaker/CURA-11851-warning-message-for-extruder2
Cura 11851 warning message for extruder2
2024-04-22 14:54:33 +02:00
Casper Lamboo
9f78b2a23c
Use definition.id to check if printer is factor 4 2024-04-22 14:53:22 +02:00
Saumya Jain
81a6988785
Merge branch '5.7' into CURA-11851-warning-message-for-extruder2 2024-04-22 14:47:21 +02:00
Saumya Jain
6542d9ff13 changes made regards to PR review
CURA-11851
2024-04-22 14:45:51 +02:00
MariMakes
58e374c739 Updated Changelog for Cura 5.7.1
With the updated changes
2024-04-22 14:45:10 +02:00
Jelle Spijker
8cbb620e62
pin cura-binary-version to 5.7.1 2024-04-22 14:28:57 +02:00
c.lamboo
a73dc80847 Merge branch 'refs/heads/5.7' into CURA-11851-warning-message-for-extruder2 2024-04-22 14:19:41 +02:00
Casper Lamboo
1ea197c472
Merge pull request #18931 from Ultimaker/factor-4-profiles
Factor 4 profiles
2024-04-22 14:18:15 +02:00
Saumya Jain
df25f5c173 Update core compatibility warning message
CURA-11851
2024-04-22 14:03:40 +02:00
Saumya Jain
21e4f99b9d Add core compatibility check for Factor4 machine
A new function has been added to the MachineManager class to check for core compatibility in the Factor4 machine. This function ensures the selected core is compatible for use with the Factor4 machine and if not, it displays a warning icon with an appropriate message.

CURA-11851
2024-04-22 14:00:56 +02:00
Paul Kuiper
913f979847 Adding Factor 4 platform and backplate.
PP-470
2024-04-22 13:10:04 +02:00
Saumya Jain
f9ddd875f6
Merge branch '5.7' into factor-4-profiles 2024-04-22 12:53:27 +02:00
pkuiper-ultimaker
8984c35c36 Applied printer-linter format 2024-04-22 10:51:30 +00:00
Paul Kuiper
5080309ed2
Removed redundant settings 2024-04-22 12:50:08 +02:00
Jelle Spijker
4b47a6df85
Pin versions
cura_binary_data still needs to be pinned
2024-04-22 12:45:49 +02:00
Paul Kuiper
87c15b0d35 Updating name translation tables for Factor 4.
PP-470
2024-04-22 10:55:01 +02:00
Paul Kuiper
67108e3e5d Profiles for the Factor 4
PP-470
2024-04-22 10:54:42 +02:00
Jelle Spijker
7beb3871c3
fix typo 2024-04-22 10:48:57 +02:00