Commit graph

15540 commits

Author SHA1 Message Date
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
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
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
Paul Kuiper
67108e3e5d Profiles for the Factor 4
PP-470
2024-04-22 10:54:42 +02:00
saumyaj3
c517311171 Applied printer-linter format 2024-04-19 14:56:51 +00:00
Saumya Jain
ee85383699 Add support z seam settings to expert.cfg and fdmprinter.def.json
This update includes two new settings in the expert visibility profile: 'support_z_seam_away_from_model' and 'support_z_seam_min_distance'. These allow users more control over the spatial relationship between the z seam of the support structure and the actual 3D model, ensuring a smoother post-printing process

CURA-11227
2024-04-19 16:55:24 +02:00
Saumya Jain
597a871807
Merge branch 'main' into CURA-11003-add-searchbar-for-offlineprinter 2024-04-12 12:32:25 +02:00
Saumya Jain
fd01684a23
Update resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2024-04-12 12:31:57 +02:00
Saumya Jain
17372064c7
Update resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2024-04-12 12:31:52 +02:00
Saumya Jain
a3911bdbfa PR comments
CURA-11003
2024-04-12 12:29:07 +02:00
Jaime van Kessel
7a5c773e90
Made printprocess reporting settings not settable per mesh 2024-04-12 11:08:35 +02:00
Saumya Jain
c010b58dad
Merge branch 'main' into main 2024-04-11 13:45:00 +02:00
Saumya Jain
1457569aeb Fix handling of undefined printer items in AddLocalPrinterScrollView
This commit addresses an issue wherein undefined current items were not properly handled in the AddLocalPrinterScrollView module. We've changed the code so that it now checks if currentItem and currentItem.name exist before attempting to assign. If they don't exist, we now set default values to avoid null or undefined references. This prevents potential errors or inconsistent behaviors in the UI.

CURA-11003
2024-04-10 17:24:55 +02:00
Saumya Jain
3908db7696 Update search bar style and theme alteration
CURA-11003
2024-04-10 15:45:24 +02:00
Saumya Jain
d017f0ec9c increased size of clear icon
CURA-11003
2024-04-08 15:37:48 +02:00