Commit graph

34290 commits

Author SHA1 Message Date
c.lamboo
a58cd69b39 use notify to update exportedSettingModel 2024-03-18 11:55:50 +01:00
Saumya Jain
40bc08f482 Apparantly the first time override is written it is not overriden by next upload.
Now, it does

CURA-11720
2024-03-14 17:09:11 +01:00
Remco Burema
7013afae16
Merge pull request #18591 from Ultimaker/CURA-11701-profile-changes-to-unsupported
not clearing the current machinein case of UCP
2024-03-14 13:00:13 +01:00
Remco Burema
ea96c3512b
Merge pull request #18602 from wawanbreton/fix_get_user_profile
Do not get user profile by loading auth data
2024-03-14 12:48:04 +01:00
Erwan MATHIEU
85b60c1f28
Do not get user profile by loading auth data 2024-03-14 11:17:12 +01:00
Casper Lamboo
9f952b91c3
Merge pull request #18588 from Ultimaker/CURA-11721-load-ucp-improovement
placing Setting loaded from ucp on top before Suggested Profile setting
2024-03-14 09:43:38 +01:00
Saumya Jain
e90cbcfa01 not clearing the current machinein case of UCP
because we don't want to write again the same thing.
CURA-11701
2024-03-13 13:38:46 +01:00
Saumya Jain
48441341f5
Merge pull request #18587 from Ultimaker/CURA-11521_long_line_sim
[CURA-11521] Fix last line when previewing active simulation.
2024-03-13 11:14:45 +01:00
Remco Burema
778bd11a71
Review comments to add a comment.
Done as part of CURA-11521
2024-03-13 11:13:03 +01:00
Remco Burema
5dcab95358
Code review: change name to 'vertex_distance_ratio'.
To be better in line with the other variables.

Done as part of CURA-11521

Co-authored-by: Saumya Jain <70144862+saumyaj3@users.noreply.github.com>
2024-03-13 11:10:04 +01:00
Saumya Jain
b5f5ced5d4
Merge branch '5.7' into CURA-11521_long_line_sim 2024-03-13 10:21:49 +01:00
Saumya Jain
cf7f807b41 placing Setting loaded from ucp on top before Suggested Profile setting
CURA-11721
2024-03-13 09:52:50 +01:00
HellAholic
0ac0e1f371
Merge pull request #18580 from Ultimaker/PP-447-Remove-solid-intent-SR30
Remove solid intent mode for SR-30 (support material) for Method X & XL
2024-03-13 09:49:20 +01:00
Erwan MATHIEU
4e564c7eb5 Add gradual flow plugin translations 2024-03-13 09:25:32 +01:00
Paul Kuiper
a67a61298e
Apply suggestions from code review
Undo changes to conandata.yml

Co-authored-by: HellAholic <alireza.doustdar@gmail.com>
2024-03-13 09:22:49 +01:00
Erwan MATHIEU
406a238d96 Update translation files with UCP file type 2024-03-13 09:03:20 +01:00
Remco Burema
d6295171dd Add the last line (when time-sim active) as a separate batch instead.
part of CURA-11521
2024-03-13 08:43:41 +01:00
Remco Burema
6e75eb34af Make lines update in real-time in the simulation-view too.
This approach does suffer from returning to exactly the same point, which can mess up the view.

part of CURA-11521
2024-03-12 23:38:09 +01:00
Paul Kuiper
2048b04024 Remove solid intent mode for SR-30 (support material)
PP-447
2024-03-12 18:03:55 +01:00
Saumya Jain
6e9b82f900 Merge branch '5.7' 2024-03-12 16:59:08 +01:00
Erwan MATHIEU
e8e106b9e9
Merge pull request #18579 from Ultimaker/CURA-11715-reenter-mimetype-for-ucp
Mimetype introduction for ucp
2024-03-12 16:42:12 +01:00
Saumya Jain
b06805dd85 Mimetype introduction for ucp
CURA-11715
2024-03-12 16:30:19 +01:00
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
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
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