Saumya Jain
5824cf5414
Both Project and UCP has same text
...
CURA-11715
2024-03-12 16:02:20 +01:00
Erwan MATHIEU
77c1dca7ff
Merge remote-tracking branch 'origin/5.7' into 5.7
2024-03-12 15:11:36 +01:00
Erwan MATHIEU
e1bfb2a60d
Update translation files with the brim_inside_margin description
2024-03-12 15:11:23 +01:00
Erwan MATHIEU
52a303e977
Slightly reformulate brim_inside_margin description
2024-03-12 14:54:22 +01:00
Saumya Jain
20cc036b61
Save as UCP text corrected
...
CURA-11715
2024-03-12 14:32:48 +01:00
Paul Kuiper
41cc4b5392
Updated Method material package versions to 2.0.0
...
PP-446
2024-03-12 09:36:35 +01:00
Paul Kuiper
634828ad20
Link up display names Nylon12-CF
...
PP-446
2024-03-11 16:04:27 +01:00
Paul Kuiper
ef833897fc
Update bundled packages with method materials. Added PET-CF and updated URLS.
...
PP-446
2024-03-11 15:14:20 +01:00
Erwan MATHIEU
c22f6955b9
Merge remote-tracking branch 'origin/5.7' into CURA-11475_low_performance_multiple_nozzles
2024-03-11 15:09:04 +01:00
Erwan MATHIEU
7c00d2f0b3
Merge remote-tracking branch 'origin/5.7' into 5.7
2024-03-11 13:25:51 +01:00
Erwan MATHIEU
790cc2ad50
Update translation labels
2024-03-11 13:25:24 +01:00
Casper Lamboo
55c133eb5b
Merge pull request #18568 from Ultimaker/CURA-11710-names-in-method-materials
...
Changed names of materials as per materials list
2024-03-11 13:08:38 +01:00
c.lamboo
77e949830a
Add missing ABS-CF material to material map
...
CURA-11710
2024-03-11 13:04:26 +01:00
Erwan MATHIEU
ff4652e16a
Add comments not to translate "Universal Cura Project"
2024-03-11 12:49:11 +01:00
Erwan MATHIEU
9865bdac70
Don't translate Cura name
2024-03-11 11:55:18 +01:00
c.lamboo
b615177739
Merge branch '5.7'
...
# Conflicts:
# conandata.yml
2024-03-11 11:32:09 +01:00
Casper Lamboo
cba5b0dc48
Merge pull request #18549 from Ultimaker/CURA-11650-thumnails-missing
...
Cura 11650 thumnails missing
2024-03-11 11:29:58 +01:00
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
Saumya Jain
78c0cfb7a3
Update ankermake_m5c.def.json
...
removed duplication
2024-03-08 11:11:13 +01:00
Saumya Jain
5f60ef2cad
Merge branch 'main' into Cura_ankermake_august
2024-03-08 11:04:03 +01:00
Saumya Jain
a39e625f77
Update resources/definitions/ankermake_m5c.def.json
...
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-03-08 11:02:58 +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
