35365 Commits

Author SHA1 Message Date
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
Saumya Jain
1f5a18d7d7 added resolve function to take the values from material profiles 2024-05-08 14:31:33 +02:00
Saumya Jain
33d95362c9 Fix name of Sketch to display
CURA-11777
2024-05-08 14:16:58 +02:00
Saumya Jain
2f8fc2cabe Updated bounds and meta values in MakerbotWriter
The MakerbotWriter.py file has been adjusted to handle "application/x-makerbot-sketch" files without providing bounding box values. Instead of using the node name for model_counts, it now uses the count of nodes under the name "instance0".
2024-05-08 11:40:30 +02:00
Saumya Jain
fdfc5dcc67 added machine bounds
CURA-11777
2024-05-07 12:51:03 +02:00
Jelle Spijker
d0da9b72eb
Use correct resource folder
Contribute to NP-186
2024-05-07 11:56:37 +02:00
saumyaj3
d8c852b74a Applied printer-linter format 2024-05-07 08:56:45 +00:00
Saumya Jain
7a52cd3cd5 Update Ultimaker Sketch definitions and refactor PNG formats in MakerbotWriter
CURA-11777
2024-05-07 10:55:23 +02:00
Saumya Jain
e33264625a Removed material temperature related settings
CURA-11777
2024-05-06 16:27:20 +02:00
Saumya Jain
0bbde663e4 Update file format and removed 'Sketch' flavor option
The file format 'application/x-makerbotsketch' has been updated to 'application/x-makerbot-sketch' across all instances in the code base. In addition, the 'Sketch' option for gcode flavor has been removed from all printer selection menus in different sections of the code. This should be added again once the code is implemented in gcode for this flavor.
Also, change flavor in ultimaker_sketch.def.json file

CURA-11777
2024-05-06 16:07:48 +02:00
Saumya Jain
4e36c570ed Added support for Makerbot Sketch file format
This commit introduces the ability to export files in the Makerbot Sketch format.Now the file can be saved as in a gcode format as well.
2024-05-06 15:55:49 +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
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
HellAholic
34491402de
Update SlicingCrash.yaml 2024-04-28 16:31:22 +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