34356 Commits

Author SHA1 Message Date
Saumya Jain
89ef927521
Merge branch 'main' into CURA-11403_save-PAP 2024-02-22 16:55:35 +01:00
Saumya Jain
a2e0d4a73f
Merge branch 'main' into CURA-11617-set-print-sequence 2024-02-22 16:55:13 +01:00
casperlamboo
0a09cee0c6 Applied printer-linter format 2024-02-22 15:22:31 +00:00
c.lamboo
bb439e5867 Introduce primetower_enable setting
CURA-11645
2024-02-22 16:21:32 +01:00
c.lamboo
501b15753d Revert "Change prime_tower_enable to prime_tower_mode in all defs/profiles"
This reverts commit 5a291f9ba9e83c85d1bdfe1c0e907e0df8154f6f.
2024-02-22 16:20:39 +01:00
c.lamboo
c8f9f179d9 Revert "Revert "Enable prime tower mode according to materials types""
This reverts commit b99762776ee6ce3fe0e8bba8724eba9ca68ec4c7.
2024-02-22 12:50:53 +01:00
c.lamboo
d009839f9e Revert "Restore prime tower options"
This reverts commit 60c3f6f2cbf4751960726eacfbc0d766ed4f16c7.
2024-02-22 12:50:50 +01:00
Casper Lamboo
448a066f54
Merge pull request #18312 from Ultimaker/PP-393-ASA-PA12-CF-SR30-Profiles
PP-393 ASA, Nylon12-CF and SR-30 print profile
2024-02-22 11:08:12 +01:00
Casper Lamboo
ffddbc9edb
Merge branch 'main' into PP-393-ASA-PA12-CF-SR30-Profiles 2024-02-22 11:06:00 +01:00
c.lamboo
60c3f6f2cb Restore prime tower options 2024-02-22 11:00:56 +01:00
c.lamboo
b99762776e Revert "Enable prime tower mode according to materials types"
This reverts commit 335a54c6d1c432e64784f95c69e77125bd0d57f1.
2024-02-22 10:47:04 +01:00
Casper Lamboo
fa01ac419a
Merge branch 'main' into PP-393-ASA-PA12-CF-SR30-Profiles 2024-02-22 10:39:41 +01:00
Saumya Jain
e99d5eb906 fixing comment
CURA-11617

CURA-11624
2024-02-22 09:59:31 +01:00
c.lamboo
3c305bb289 Fix dialog_on_ucp_project_save preference
CURA-11403
2024-02-21 19:30:36 +01:00
Saumya Jain
53b3eadb3c Adding printOrder to pasted elements
CURA-11617

CURA-11624
2024-02-21 18:20:19 +01:00
c.lamboo
6f9fd3c46d Merge remote-tracking branch 'origin/CURA-11403_save-PAP' into CURA-11403_save-PAP 2024-02-21 16:51:00 +01:00
c.lamboo
5f7a1c7b7b Use correct mime-type
CURA-11403m
2024-02-21 16:50:46 +01:00
Remco Burema
5f884c737b Fix build, prevent protobuf version mismatch. 2024-02-21 16:39:50 +01:00
Saumya Jain
982f82c1a1 Removing debug statement
CURA-11624
2024-02-21 15:22:20 +01:00
Saumya Jain
2681932fec Adding cura share icon to thumbnail
CURA-11624
2024-02-21 15:20:38 +01:00
Saumya Jain
909a4156f3 Updating _ucp_model to None everytime a write is done
CURA-11403
2024-02-21 15:13:27 +01:00
c.lamboo
62aff0be12 Determine ucp based on included file
CURA-11403
2024-02-21 11:40:51 +01:00
c.lamboo
08b70252a4 Remove duplicated mime type
CURA-11403
2024-02-21 11:24:09 +01:00
Paul Kuiper
59a23231cc Include prime tower mode
PP-393
2024-02-20 20:13:27 +01:00
Paul Kuiper
f6c9936d1e Remove SR-30 from exclude list
PP-393
2024-02-20 19:49:49 +01:00
Saumya Jain
ae686bcad9
Merge branch 'main' into CURA-11403_save-PAP 2024-02-20 17:08:46 +01:00
Saumya Jain
942589d3a2 filename is basename without the printer info
CURA-11403
2024-02-20 17:05:23 +01:00
Saumya Jain
d2566d72ff for preference to open dialo while saving ucp
CURA-11403
2024-02-20 16:56:34 +01:00
Saumya Jain
ce3baa15e2 file name is coming from CuraApplication Instance
CURA-11403
2024-02-20 16:56:05 +01:00
casperlamboo
8fcdd09b7b Applied printer-linter format 2024-02-20 15:49:37 +00:00
c.lamboo
bc41b8f801 Use string for prime tower enum value 2024-02-20 16:48:38 +01:00
c.lamboo
11a4588546 Properly handle exceptions
CURA-11403
2024-02-20 16:27:47 +01:00
c.lamboo
6bbdd54342 Remove unused _is_ucp
CURA-11403
2024-02-20 16:17:39 +01:00
c.lamboo
e075409243 Return False in case of exception
CURA-11403
2024-02-20 15:07:48 +01:00
c.lamboo
a463e51788 Remove unneeded thread lock
CURA-11403
2024-02-20 15:07:34 +01:00
c.lamboo
f61991e261 Untangle write function
CURA-11403
2024-02-20 15:04:44 +01:00
Saumya Jain
41bcb037cb
Merge branch 'main' into CURA-11403_save-PAP 2024-02-20 14:42:30 +01:00
Saumya Jain
bd52c91c94 adding lambda for number of args
CURA-11403
2024-02-20 14:41:48 +01:00
c.lamboo
efd6284f6e Make ucp model available in workspace writer
CURA-11403
2024-02-20 13:47:51 +01:00
Saumya Jain
ec871782c7 PAP adding save dialog before filesave window
CURA-11403
2024-02-20 10:47:27 +01:00
Mariska
8109230e99
Update Slicing Crash Template with 5.7 alpha
It now refers to the 5.7 Alpha that has Sentry to analyze slicing crashes
2024-02-20 10:43:59 +01:00
Casper Lamboo
ac5afcba55
Merge pull request #18372 from Ultimaker/restore_geeetech_A20_1_extruder_definition
restore extruder definition
2024-02-19 13:22:15 +01:00
Mariska
a4ec177cd3
Remove the link to the nightly build
The nightly was broken so the download links were removed, this is to remove them from the slicing crash form.
2024-02-19 13:08:27 +01:00
HellAholic
e8e0bd9782 Applied printer-linter format 2024-02-19 10:39:20 +00:00
Jacob Pedersen
d458437d50 Add definition and variants for creality ender3 v2 neo 2024-02-19 11:39:13 +01:00
HellAholic
ca94e0e355 restore extruder definition 2024-02-19 11:38:30 +01:00
Casper Lamboo
ab1d1407fb
Merge branch 'main' into CURA-11403_save-PAP 2024-02-19 10:35:12 +01:00
Jelle Spijker
546d82a932
fix trailing comma 2024-02-17 14:53:35 +01:00
Jelle Spijker
87d6c4092f
Remove redundant default_mode prime_tower 2024-02-17 13:48:51 +01:00
Jelle Spijker
08c24b05ec
Write out options 2024-02-17 12:55:10 +01:00