15552 Commits

Author SHA1 Message Date
Erwan MATHIEU
a34a442009 Add dedicated conandata.yml for cura_resources 2024-05-31 14:58:58 +02:00
HellAholic
1e69f4740b
Merge pull request #19089 from Ultimaker/CURA-11912
Change `value` to `resolve`
2024-05-23 10:43:54 +02:00
HellAholic
328af077e5
Merge pull request #19029 from Ultimaker/CURA-11777-yeet-sketch-to-makerbot
Cura 11777 yeet sketch to makerbot
2024-05-17 10:43:55 +02:00
c.lamboo
0d017f725a Change value to resolve
CURA-11912
2024-05-17 09:56:49 +02: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
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
Saumya Jain
33d95362c9 Fix name of Sketch to display
CURA-11777
2024-05-08 14:16:58 +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
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
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
4379a00b41
Merge branch 'main' into main 2024-05-03 10:05:25 +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
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
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
c.lamboo
a73dc80847 Merge branch 'refs/heads/5.7' into CURA-11851-warning-message-for-extruder2 2024-04-22 14:19:41 +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
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