Commit graph

34647 commits

Author SHA1 Message Date
GregValiant
dabc3d8032 Rewrite - Insert At Layer Change
This is an extensive re-do of the script.
#     Added an 'Enable' setting
#     Added support for multi-line insertions (comma delimited)
#     Added insertions in a range of layers or a single insertion at a layer.  Numbers are consistent with the Cura Preview (base1)
#     Added frequency of Insertion (once only, every layer, every 2nd, 3rd, 5th, 10th, 25th, 50th, 100th)
#     Added support for 'One at a Time' print sequence
2024-05-15 20:53:20 -04:00
Casper Lamboo
f3811854d4
Merge pull request #19043 from Ultimaker/PP-484_Create_Factor4_fast_quality
[PP-484] Create Factor 4 "fast" global quality
2024-05-14 09:58:37 +02:00
Jelle Spijker
5d030578ca
Merge pull request #19072 from Ultimaker/CURA-11897_decoupled_resources
fix wrong channel
2024-05-13 12:04:08 +02:00
Jelle Spijker
52e850b847
fix wrong channel 2024-05-13 11:58:58 +02:00
Jelle Spijker
16a2fc3360
fix wrong channel 2024-05-13 10:09:37 +02:00
Jelle Spijker
5e731b8575
Merge pull request #19039 from Ultimaker/NP-186_seperate_cura_resources
Np 186 seperate cura resources
2024-05-10 13:31:08 +02:00
Jelle Spijker
e1603f3efd
Use testing for cura_resources
Contribute to NP-186
2024-05-10 13:30:49 +02:00
Jelle Spijker
52cf75ae99
Don't use conandata
Contribute to NP-186
2024-05-10 11:39:50 +02:00
Jelle Spijker
3d4dd19c33
Merge branch 'refs/heads/main' into NP-186_seperate_cura_resources 2024-05-10 11:34:21 +02:00
Jelle Spijker
9e1d6b1537
Addressed code-review comments
Contribute to NP-186
2024-05-10 11:33:55 +02:00
Jelle Spijker
3323d85ab0
Add paths to CURA_ENGINE_SEARCH_PATH in conanfile.py
Added new paths to CURA_ENGINE_SEARCH_PATH, specifically under "definitions" and "extruders". This ensures these directories are properly detected and searched in the Cura Engine.

Contribute to NP-186
2024-05-10 10:01:29 +02:00
Frederic Meeuwissen
6215a65af6 Create um_f4_global_Fast_Quality.inst.cfg 2024-05-08 16:26:07 +02:00
Jelle Spijker
d0da9b72eb
Use correct resource folder
Contribute to NP-186
2024-05-07 11:56:37 +02:00
Jelle Spijker
0ae3574b05
use append
Contribute to NP-186
2024-05-06 15:22:07 +02:00
Jelle Spijker
8be474df39
Set CURA_RESOURCES env
Additional paths for Cura resources are appended in the package information, for use in defining the Cura resource directory. This modification enhances the path setup in conanfile.py, offering greater versatility for referencing Cura resources.

Contribute to NP-186
2024-05-06 14:42:49 +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
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
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 d6164fddae.
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
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