35095 Commits

Author SHA1 Message Date
Saumya Jain
f7f56e8766 Add sketch to cloud
CURA-11777
2024-05-06 13:32:52 +02:00
Jelle Spijker
9824c5703c
Update resource directories in Conanfile
Resource directories in the Conanfile have been updated to include full resource paths and also preserve the original directory structure when copying. The 'keep_path' option has been set to true to maintain the original path structure during the copying process.

Contribute to NP-186
2024-05-06 13:11:52 +02:00
saumyaj3
f150d304d6 Applied printer-linter format 2024-05-06 09:48:19 +00:00
Saumya Jain
810529e01b Add Makerbot Sketch printer support
This commit adds support for the Makerbot Sketch 3D printer. This includes setting specific configuration parameters, defining a new machine definition and relevant build platform mesh. Material compatibility restrictions are also outlined to adhere with the capabilities of the printer.

CURA-11777
2024-05-06 11:46:54 +02:00
Jelle Spijker
0942c35c0a
Add cura_resources as dependency and update resource directories
A new dependency 'cura_resources' has been added to the conandata.yml. The handling of 'cura_resources' has been updated, now including specific sections for definitions, extruders, intent, meshes, quality and variants. GitHub Actions workflows and conan scripts have been adjusted accordingly to include these changes.

Contribute to NP-186
2024-05-06 11:40:39 +02:00
Jelle Spijker
26c4354ac2
Reuse conandata.yml from Cura
The changes mainly include improvements to the code layout and maintainability in conanfile.py script. With additional importations and enhancing the file copy operations, the process is made clearer and reusable. Meanwhile, conandata.yml has been removed for redundancy in favor of on-the-fly version data updates.

Contribute to NP-186
2024-05-06 08:23:38 +02:00
HellAholic
a9084f372d
Merge pull request #18916 from Ultimaker/CURA-11227-zseam-support
Add support z seam settings
2024-05-03 15:01:26 +02:00
Saumya Jain
003808c9a2 remove unused default settings
CURA-11090
2024-05-03 14:17:42 +02:00
saumyaj3
135a6bb43d Applied printer-linter format 2024-05-03 10:51:34 +00:00
Saumya Jain
1de32a864b
Merge pull request #17871 from itay-grudev/main
K1 Max Printer Definition
2024-05-03 12:50:31 +02:00
Saumya Jain
ee7b8e4574
Merge branch 'main' into main 2024-05-03 12:25:46 +02:00
saumyaj3
542da3fbdf Applied printer-linter format 2024-05-03 10:23:01 +00:00
Saumya Jain
5485ee7a21 remove unused settings
CURA-11707
2024-05-03 12:22:00 +02:00
Saumya Jain
9e2ffd5255
Merge branch 'main' into main 2024-05-03 10:37:06 +02:00
Saumya Jain
f36db2ced7 fixing versioning
CURA-11707
2024-05-03 10:36:25 +02:00
Saumya Jain
ea6efbd26f
Merge branch 'main' into main 2024-05-03 10:26:20 +02:00
saumyaj3
83b99e3b40 Applied printer-linter format 2024-05-03 08:15:43 +00:00
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
WinstonMao
d8d8144303 Merge branch 'main' of https://github.com/WEEDO3DTECH/Cura 2024-04-28 10:48:30 +08:00
WinstonMao
47fdb12d53 Merge branch 'main' of https://github.com/WEEDO3DTECH/Cura 2024-04-28 10:48:20 +08:00
WinstonMao
570d18153b Merge branch 'main' of https://github.com/WEEDO3DTECH/Cura 2024-04-28 10:47:53 +08:00
WinstonMao
8dac637980 Merge branch 'Ultimaker:main' into main 2024-04-28 10:47:34 +08:00
WinstonMao
9098e2b286
Merge branch 'Ultimaker:main' into main 2024-04-28 10:23:45 +08:00
WinstonMao
6b0659f87a Merge branch 'main' of https://github.com/WEEDO3DTECH/Cura 2024-04-28 10:22:59 +08: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
WinstonMao
a464cbd9f6 Sync with main branch 2024-04-28 10:17:30 +08:00
WinstonMao
2c4859d4bf Applied printer-linter format 2024-04-28 02:06:19 +00:00
WinstonMao
d072c71621 Sync with main branch 2024-04-28 10:05:31 +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