Commit graph

14158 commits

Author SHA1 Message Date
Joey de l'Arago
2019d8f3af Start MachineSelector refactor by allowing list model to be passed in.
CURA-9424
2022-11-04 15:11:04 +01:00
c.lamboo
f803279a43 Merge branch '5.2'
# Conflicts:
#	conandata.yml
2022-11-04 14:00:40 +01:00
c.lamboo
4496f3fef3 Merge remote-tracking branch 'origin/feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud' into feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 2022-11-04 13:48:39 +01:00
c.lamboo
c5788be6f7 Add ids with interactable components
Makes it easier to perform automatic ui testing

contributes to CURA-8689
2022-11-04 13:48:31 +01:00
Casper Lamboo
81f8939c1f
Update resources/qml/WelcomePages/AddThirdPartyPrinter.qml
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
2022-11-04 13:40:49 +01:00
c.lamboo
c892bac27f Use paragraph for in favor of ordered list
Text indentation became when the text would span multiple lines

contributes to CURA-8689
2022-11-03 10:45:29 +01:00
c.lamboo
d07c2c2c0d Update copy
contributes to CURA-8689
2022-11-03 10:37:02 +01:00
jelle spijker
c8f51a6743 Correctly wrap text body
to prevent weird alignment in welcome pages

CURA-8689
2022-11-03 10:08:00 +01:00
Ed Ropple
226dbe57a1
changed cr10smart to refer to creality_base for 5.2.1 compat 2022-11-02 18:24:11 -04:00
Ed Ropple
46d76edc20
renamed .json to .def.json 2022-11-02 18:16:20 -04:00
Joey de l'Arago
dbba1c4110 patch checking for base parent component of Combobox to check if it exists first. This should be refactored out some time.
CURA-9424
2022-11-02 15:14:33 +01:00
c.lamboo
4381a97c85 Elide button text when text becomes too wide
contributes to CURA-8689
2022-11-02 14:58:25 +01:00
c.lamboo
2487cf17dd Merge remote-tracking branch 'origin/feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud' into feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 2022-11-02 14:15:51 +01:00
c.lamboo
975775b7a0 Add various dark-mode welcome-page assets
contributes to CURA-8689
2022-11-02 14:15:37 +01:00
jelle spijker
1dfac6bb71 Apply screenScaleFactor to image size
Contributes to CURA-8689
2022-11-02 14:00:35 +01:00
c.lamboo
1ebc0b487e Add various assets welcome-page assets
contributes to CURA-8689
2022-11-02 13:54:00 +01:00
Ed Ropple
d653736325
fixed bed dimensions of Sovol SV01 and SV02 2022-11-02 01:14:09 -04:00
Ed Ropple
dbcf6afd20
added definition and variants or Creality CR-10 Smart 2022-11-02 01:11:10 -04:00
c.lamboo
056221cda6 Remove "Add cloud printer" button in onboarding-add printer flow
From figma design

contributes to CURA-8689
2022-11-01 17:00:40 +01:00
c.lamboo
846102be4e Update campaign links in onboarding-add printer flow
contributes to CURA-8689
2022-11-01 16:59:25 +01:00
c.lamboo
5cb67ab8c4 Add new pages in add-printer flow
Pages added
- Page to select Ultimaker or third party printer
- Page with information how to add Ultimaker printer(s)

contributes to CURA-8689
2022-11-01 16:11:34 +01:00
Remco Burema
f75cb7a48b
Merge pull request #11678 from Ultimaker/brim_per_material_optimized_order
Brim overhaul: New features and bug fixes
2022-10-30 17:59:36 +01:00
Lorenzo Romagnoli
9a1eca50e4 Updated splashscreen
Updated splash screen logo with new logo with capital M
2022-10-28 12:02:55 +02:00
Lorenzo Romagnoli
6e6b5cbbc4
Update logo.svg 2022-10-27 12:22:31 +02:00
Jaime van Kessel
5c18a37f60
Merge branch 'main' of github.com:Ultimaker/Cura into PP-251_create_annealing_intent 2022-10-26 11:28:58 +02:00
Luke Harrison
225fed0519 More tweaks because I am bored and it has not been merged yet. 2022-10-25 22:18:34 +02:00
Remco Burema
ab51bd699e Merge branch 'main' into brim_per_material_optimized_order 2022-10-25 17:31:13 +02:00
Christian Kvasny
53e163011e
Update vzbot_base.def.json
Adjusted some default values
2022-10-25 11:34:17 +02:00
just-trey
8f0b116df4 changed max speed warning 2022-10-24 10:46:46 -04:00
Luke Harrison
09f620e6ce Dial back iniital layer speed 2022-10-24 14:12:49 +02:00
Luke Harrison
50e22a122a More small tweaks 2022-10-24 13:18:27 +02:00
Luke Harrison
00e7a20d32 Small settings tweaks. Here's hoping for a 5.2.2 merge 2022-10-24 12:41:57 +02:00
just-trey
6e5e3db627 Add AnkerMake M5 Profile 2022-10-22 19:56:51 -04:00
Joey de l'Arago
a9f4b2da71
Merge pull request #12254 from Ultimaker/fix_materials_list_too_small
Allow text to be wider if favourite button is not shown
2022-10-21 11:16:26 +02:00
Joey de l'Arago
09c86e6b98
Merge pull request #13319 from Ladnessness/main
Update Actions.qml
2022-10-21 10:26:47 +02:00
jelle spijker
ec9dcc43b4 Update changelog 5.2.1 2022-10-19 16:08:53 +02:00
c.lamboo
c8a1b435a1 Add updated chinese translations 2022-10-19 15:48:48 +02:00
c.lamboo
8dbf69d2cc Revert incorrect update of translations
Accidentally overwrote the cn with cz translations
2022-10-19 15:48:36 +02:00
c.lamboo
15a39fc51b Update italian translations 2022-10-19 15:48:24 +02:00
c.lamboo
670f439fe2 update pt_br po files 2022-10-18 14:02:35 +02:00
c.lamboo
78ee77c361 update .mo files 2022-10-18 12:05:04 +02:00
Rijk van Manen
d5020425bc fix mistakes
PP-42
2022-10-17 15:55:03 +02:00
Rijk van Manen
c47243cdde remove specific initial layer bed temperature
Forgot to remove an initial layer setting. PP-42
2022-10-17 14:52:10 +02:00
Rijk van Manen
7612faea79 make initial flow settings a fraction of the initial layer flow
PP-42
2022-10-17 14:51:05 +02:00
Rijk van Manen
9f6a47f04a
Merge branch 'main' into PP-42_improved_initial_layer_settings 2022-10-17 13:51:20 +02:00
Duarte Bragadesto
5a05f8ed4c
Update resources/definitions/blocks_pros30.def.json
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2022-10-14 17:42:17 +01:00
Duarte Bragadesto
01fb120883
Update Blocks Variants 2022-10-14 17:40:46 +01:00
Duarte Bragadesto
27b9c1e686
Update Standard Files 2022-10-14 17:38:37 +01:00
Duarte Bragadesto
7610d92a4f
Update Global Files 2022-10-14 17:37:32 +01:00
Duarte Bragadesto
b39a00b440
Update Blocks Global Files 2022-10-14 17:36:41 +01:00