Christian Kvasny
d97bc371e5
Merge branch 'Ultimaker:main' into main
2022-11-30 01:23:16 +01:00
Jelle Spijker
49ff7c00d7
Merge pull request #13256 from ansonl/dxu_umo_definition
...
Add DXU UMO+ definition for UMO+ printer frame
2022-11-29 21:04:08 +01:00
Anson Liu
d377adead4
Update dxu_umo.def.json
...
Removed redundant nozzle size and filament diameter already specified in parent.
2022-11-29 14:53:23 -05:00
Anson Liu
3f7466a4ca
Merge branch 'Ultimaker:main' into dxu_umo_definition
2022-11-29 14:43:42 -05:00
Jelle Spijker
fb917a88fb
Don't format
...
Something seems to be broken
2022-11-29 20:36:04 +01:00
Anson Liu
786c5ca0aa
Merge branch 'Ultimaker:main' into dxu_umo_definition
2022-11-29 14:31:42 -05:00
Joey de l'Arago
82f4f9ed16
Merge pull request #13856 from Ultimaker/printer_linter
...
Added a linting tool for Cura Printers and Profiles
2022-11-29 17:58:59 +01:00
jspijker
c0d92e90f8
Fix extruders formatting/diagnosing
2022-11-29 17:29:44 +01:00
Casper Lamboo
1672cd639f
Merge pull request #13914 from Ultimaker/CURA-9808_UltiMaker
...
CURA 9808 UltiMaker
2022-11-29 16:36:07 +01:00
jspijker
8a1f94c832
Fix format-definition-paired-coordinate-array
2022-11-29 16:23:59 +01:00
Casper Lamboo
934a036e3d
Update resources/i18n/cs_CZ/cura.po
...
Cura-9808
2022-11-29 15:28:48 +01:00
Casper Lamboo
f4edc3a5d6
Update translation string
...
Cura-9808
2022-11-29 15:28:13 +01:00
c.lamboo
b22fafadbe
Don't capitalise "M" in "Ultimaker Digital Library" and "Ultimaker Digital Factory"
...
because these are brand names.
CURA-9793
2022-11-29 15:26:51 +01:00
c.lamboo
7efbf6ed1e
Translate string
...
CURA-9793
2022-11-29 15:26:15 +01:00
c.lamboo
00facd85d1
Change string to use the "UltiMaker" brand name
...
CURA-9793
2022-11-29 15:19:14 +01:00
jspijker
ae6fdfa34f
Merge branch 'printer_linter' into printer_linter_pr_review
2022-11-29 14:39:37 +01:00
jspijker
ef00dfdcc7
Merge branch 'main' into printer_linter
2022-11-29 14:35:39 +01:00
Jaime van Kessel
8b42d0ca8c
Merge pull request #13817 from Ultimaker/PP-69-default-max-comb-distance
...
PP-69-default-max-comb-distance
2022-11-29 09:18:38 +01:00
jspijker
ac8549cc14
Updated macos installer background
...
Contributes to CURA-9808
2022-11-28 16:26:06 +01:00
jspijker
8280abd420
Updated macos installer background
...
Contributes to CURA-9808
2022-11-28 14:51:35 +01:00
jspijker
c3b596b517
Updated cura banner NSIS installer
...
Contributes to CURA-9808
2022-11-28 14:50:19 +01:00
jspijker
f76f711790
Update mentions to UltiMaker
...
Contributes to CURA-9808
2022-11-28 14:11:21 +01:00
jspijker
68f6a0d146
Update mentions to UltiMaker
...
Contributes to CURA-9808
2022-11-28 13:31:35 +01:00
jspijker
73ee6d369e
Update disclaimer to mention UltiMaker
...
Contributes to CURA-9808
2022-11-28 13:26:52 +01:00
Joey de l'Arago
ff65c1a670
Merge pull request #13886 from Ultimaker/9773-add_quality_type_to_ufp_files
...
Add quality type to ufp files
2022-11-28 13:19:09 +01:00
c.lamboo
be40920042
Fix cura crashing
...
`activeQualityDisplayNameMap` no longer returned a dict and could thus not be a pyqt property
Cura-9773
2022-11-28 13:14:47 +01:00
c.lamboo
8e8437eab0
Split of getStringParts function
...
Spit into `getMainStringParts` and `getTailStringParts` so we can easily differentiate between the two in the front-end.
Cura-9773
2022-11-28 13:10:52 +01:00
Joey de l'Arago
5ed572779d
remove redundant properties in settings
...
CURA-9773
2022-11-28 12:44:20 +01:00
Joey de l'Arago
8dcccd941b
Add dataclass for ActiveQuality. Move some logic out of MachineManager into ActiveQuality.
...
CURA-9793
2022-11-28 12:40:35 +01:00
jspijker
99f308bd3c
Update pot files to use UltiMaker
...
Contributes to CURA-9808
2022-11-28 12:39:34 +01:00
jspijker
b1ec8599d2
Use UltiMaker for themes
...
Contributes to CURA-9808
2022-11-28 11:39:07 +01:00
jspijker
a5b8ea93d9
Use UltiMaker for bundled plugins
...
Contributes to CURA-9808
2022-11-28 11:32:07 +01:00
Casper Lamboo
f297909a82
Fix type signature of function
...
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
2022-11-28 11:23:53 +01:00
Casper Lamboo
a645fa7d96
Use bracket to initialise list
...
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
2022-11-28 11:22:53 +01:00
jspijker
ed6018d4ad
Update pyinstaller scripts using UltiMaker
...
Contributes to CURA-9808
2022-11-28 11:22:11 +01:00
jspijker
14eb9371f6
Update AppImage scripts using UltiMaker
...
Contributes to CURA-9808
2022-11-28 11:12:37 +01:00
jspijker
a727228a12
Update dmg scripts using UltiMaker
...
Contributes to CURA-9808
2022-11-28 11:05:59 +01:00
jspijker
3be5581243
Update NSIS scripts using UltiMaker
...
Contributes to CURA-9808
2022-11-28 11:03:45 +01:00
Joey de l'Arago
36fcc34bbd
Merge pull request #13888 from Ultimaker/CURA-9931_cache_product_id_table
...
[CURA-9931] Cache and genericize ID to Product table.
2022-11-28 11:02:33 +01:00
jspijker
61623720ca
Update copyright using UltiMaker
...
Contributes to CURA-9808
2022-11-28 10:48:38 +01:00
jspijker
0bb59acdf8
Update company name to UltiMaker
...
Contributes to CURA-9808
2022-11-28 10:14:51 +01:00
Joey de l'Arago
3eb5f91fd6
align dictionary values and add comma to end of dict.
2022-11-28 09:14:42 +01:00
Joey de l'Arago
a809e5a91c
don't shadow format function.
2022-11-28 09:13:19 +01:00
jspijker
e1b9630ca4
Update company name to UltiMaker in po files
...
Contributes to CURA-9808
2022-11-28 09:12:20 +01:00
jspijker
696c0f8547
Update company name to UltiMaker
...
Contributes to CURA-9808
2022-11-28 09:05:21 +01:00
jspijker
772cc0d57f
Update company name in conanfile
...
Contributes to CURA-9808
2022-11-28 08:44:21 +01:00
jspijker
ebd91623d0
Change company name in about dialog to UltiMaker
...
Contributes to CURA-9808
2022-11-28 08:41:04 +01:00
jspijker
953bb38c92
Update app name to UltiMaker Cura
...
Contributes to CURA-9808
2022-11-28 08:38:09 +01:00
c.lamboo
4fa024cd31
Group intent and quality
...
Bit of an ugly hack. At later point in the code it is assumed the first element of the list is the main part and the remaining elements form the suffix. Intent and the profile form both the main part so these need to be grouped together.
Cura-9773
2022-11-25 16:48:06 +01:00
c.lamboo
76564f7bc4
Add dash between main, and suffix part of quality display name
...
Cura-9773
2022-11-25 16:46:21 +01:00
