34356 Commits

Author SHA1 Message Date
Saumya Jain
0da0c720dd Changed names of materials as per materials list
Removed materials with GUID not found

CURA-11710
2024-03-11 11:04:51 +01:00
Jelle Spijker
ee23e2cf67
Add native CAD plugin to Enterprise edition
The native CAD plugin has been added to the requirements and reference copy operations in the Conan data file and Conan file script.
Now the native CAD plugin will only be included if the enterprise build flag is set. This ensures that unnecessary dependencies are not brought into non-enterprise builds.
2024-03-11 11:01:53 +01:00
Erwan MATHIEU
1f3f2cf198
Merge pull request #18552 from Ultimaker/set_5.7_versions
Pin package and requirements versions
2024-03-11 10:16:25 +01:00
Saumya Jain
6d6663c83d
Merge pull request #18554 from Ultimaker/CURA-11709-missing-nylon-material
Add missing nylon material to material map
2024-03-11 10:00:57 +01:00
Saumya Jain
5aace94659
Merge branch '5.7' into CURA-11709-missing-nylon-material 2024-03-11 09:54:57 +01:00
Erwan MATHIEU
9eace13dc9
Update version to 5.8 alpha 2024-03-11 09:04:39 +01:00
Erwan MATHIEU
3bfce9f003
Pin grpc_definitions version 2024-03-11 08:39:57 +01:00
Erwan MATHIEU
0520452f46
Use stable channel only for packages with release branch 2024-03-11 08:33:51 +01:00
Erwan MATHIEU
f4d8d643e0
Set correct beta version number 2024-03-11 08:18:07 +01:00
Casper Lamboo
3fee8ba851
Update cura/PrinterOutput/Models/MaterialOutputModel.py 2024-03-08 16:59:04 +01:00
Saumya Jain
a4d18601c7
Merge branch '5.7' into CURA-11650-thumnails-missing 2024-03-08 16:47:19 +01:00
Saumya Jain
64bb69c48f removing magic number Adding max render distance
CURA-11650
2024-03-08 16:46:58 +01:00
Saumya Jain
c4881641c3 review comments fixing
CURA-11650
2024-03-08 16:44:03 +01:00
Saumya Jain
28997b0b14
Update cura/Snapshot.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-03-08 16:38:57 +01:00
Casper Lamboo
4d2bab4917
Merge pull request #18550 from Ultimaker/CURA-11705-updating-strings-in-CURA
Cura 11705 updating strings in cura
2024-03-08 16:32:47 +01:00
Erwan MATHIEU
f5d1256125 Use latest packages versions 2024-03-08 16:20:27 +01:00
c.lamboo
6e6ca515cd Add missing nylon material to material map
CURA-11709
2024-03-08 16:07:41 +01:00
Erwan MATHIEU
7b45fd9368
Pin pysavitar and pynest2d to the stable versions 2024-03-08 15:39:41 +01:00
Erwan MATHIEU
1f61199402 Pin package and requirements versions 2024-03-08 15:34:48 +01:00
Saumya Jain
38685793ab
Merge branch 'main' into CURA-11705-updating-strings-in-CURA 2024-03-08 14:46:04 +01:00
saumyaj3
4d77972600 Applied printer-linter format 2024-03-08 13:42:10 +00:00
Saumya Jain
143dd20392
Update fdmprinter.def.json 2024-03-08 14:41:17 +01:00
Saumya Jain
9e17a55c17 Dtring finishing for Prime tower type and print sequence
CURA-11705
2024-03-08 14:39:12 +01:00
Saumya Jain
02fd7546a1
Merge branch 'main' into CURA-11650-thumnails-missing 2024-03-08 13:59:40 +01:00
Casper Lamboo
690eb81940
Merge pull request #18539 from Ultimaker/CURA-11655_fix_method_materials_loading
CURA-11655 Fix Method X/XL material selection
2024-03-08 13:53:49 +01:00
Saumya Jain
fe8f209484
Merge branch 'main' into CURA-11650-thumnails-missing 2024-03-08 13:46:16 +01:00
Saumya Jain
ebe5da7f0e added creating snapshot if not created till 10 attempts
refractored the snapshot.py

CURA-11650
2024-03-08 13:43:43 +01:00
HellAholic
0149be1228
Merge pull request #18466 from Ultimaker/CURA-9838_brim_location
Cura 9838 brim location
2024-03-08 13:32:41 +01:00
Saumya Jain
174368d1eb description of UCP
CURA-11705
2024-03-08 12:08:32 +01:00
Casper Lamboo
f540619190
Merge pull request #18545 from Ultimaker/PP-441-Generic-PEKK-profile
Added the generic_petcf
2024-03-08 10:50:01 +01:00
HellAholic
077ac06e84 Added the generic_petcf
Generic petcf was dropped during clean up. After confirmation with Frederic added it back to the exclude list
2024-03-08 10:44:31 +01:00
Casper Lamboo
675bafd9cc
Merge pull request #18540 from Ultimaker/PP-428-2-Improve-TPU-top-surface
PP-428 - Improve top layer quality of TPU
2024-03-07 17:38:18 +01:00
Frederic Meeuwissen
47a3d4ddbd Improve top layer quality of TPU
Recommited from Paul's changes to resolve conflicts
2024-03-07 17:27:07 +01:00
Erwan MATHIEU
fa2257aaa3 Add fallback for uuid retrieval from DF
CURA-11655
2024-03-07 16:48:47 +01:00
Saumya Jain
dc031c4674 spelling of acquire
CURA-11650
2024-03-07 16:35:19 +01:00
Casper Lamboo
5f5758c49d
Merge pull request #18476 from Ultimaker/PP-441-Generic-PEKK-profile
Cleanup and extent material exclude list
2024-03-07 16:19:13 +01:00
Casper Lamboo
26d181c695
Merge branch 'main' into PP-441-Generic-PEKK-profile 2024-03-07 16:19:05 +01:00
Saumya Jain
5a3e2246e1
Merge branch 'main' into CURA_11650-thumnails-missing 2024-03-07 16:18:01 +01:00
c.lamboo
2c033b7adc Remove incorrect space 2024-03-07 16:15:35 +01:00
Saumya Jain
e905ac9d33 adding a lock for the create snapshot
CURA-11650
2024-03-07 16:13:19 +01:00
Casper Lamboo
8e61996ced
Remove wildcards from definition files 2024-03-07 16:07:15 +01:00
Jelle Spijker
87fc932e45
Merge pull request #18534 from Ultimaker/use-proper-gradualflow_version
Use proper gradual flow plugin version
2024-03-07 12:06:07 +01:00
Erwan MATHIEU
d73457434b
Merge branch 'main' into use-proper-gradualflow_version 2024-03-07 11:51:55 +01:00
Erwan MATHIEU
66aeb3b465
Apply suggested description simplification
CURA-9838

Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2024-03-07 11:48:09 +01:00
Saumya Jain
9ded56c54f
Merge pull request #18523 from Ultimaker/CURA-11657_fix_usb_print_crash
CURA-11657 Fix crashes with USB printing
2024-03-07 11:18:54 +01:00
Saumya Jain
9d35ee5fce
Merge branch 'main' into CURA-11657_fix_usb_print_crash 2024-03-07 11:15:48 +01:00
Erwan MATHIEU
af989356a5 Use proper gradual flow plugin version 2024-03-07 10:40:59 +01:00
Erwan MATHIEU
cd8c5029d2 Remove useless code
The resolve properties on the QML objects cause a crash in PyQt. They are not the actual cause, because this should work anyway. But for now, they are however completely useless because the material bed temperature setting can't have a resolve function, so we can remove them anyway.

CURA-11657
2024-03-06 16:00:38 +01:00
Remco Burema
0f02821f2f
Merge pull request #18469 from Ultimaker/CURA-11403-pap-modification
Cura 11403 pap modification
2024-03-06 14:02:44 +01:00
Saumya Jain
dbf722e034 added settings for modifier meshes and grouped meshed
CURA-11403
2024-03-06 13:38:33 +01:00