GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 08:19:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,538 Commits 290 Branches 260 Tags
Commit Graph

30538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jspijker
efa302ef19 Removed and extra space 2022-11-08 11:27:51 +01:00
jspijker
8800288359 Runs apt update on all Linux 2022-11-08 11:27:07 +01:00
jspijker
cbaf4bed16 Merge branch 'main' into feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 2022-11-08 11:23:05 +01:00
jspijker
8969e34021 update the system packages for all Linux versions 2022-11-07 17:03:54 +01:00
jspijker
81af19dc43 Use GCC10 as default for Ubuntu-20.04 2022-11-07 09:19:58 +01:00
jspijker
96597152bc Use GCC10 as default for Ubuntu-20.04 2022-11-07 09:18:34 +01:00
jspijker
da304aec90 Revert "Use GCC12 as default for all Linux runners" 
This reverts commit 6ddc16709b4dcb9b6b2214ad36918dbe1c191b55.
 2022-11-07 09:18:34 +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
Remco Burema
00dbe92814 Revert "Restrict permissions, should only need to read here." 
This reverts commit 61a491f910abd2fbb69d3da02f76995ec2926c26.
 2022-11-04 12:00:39 +01:00
Remco Burema
61a491f910 Restrict permissions, should only need to read here. 2022-11-04 11:57:53 +01:00
Remco Burema
15f31a7c0c Merge branch 'main' into PR-13661 2022-11-04 11:51:26 +01:00
jelle spijker
6ddc16709b Use GCC12 as default for all Linux runners 2022-11-04 10:13:52 +01:00
Remco Burema
997b6f830d Manually revert part of PR. 
It shouldn't really be nescesary, but you _can_ put any gcode flavour in relative or absolute, so we should also deal with that in the pause-at-height script.
 2022-11-04 09:12:47 +01:00
Remco Burema
b1138e12d9 Merge branch 'main' 2022-11-04 08:47:50 +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
j.spijker@ultimaker.com
c20410d732 build info and create in one step 2022-11-03 08:42:24 +01:00
jelle spijker
30555dbd5b Use lockfile and build_id 2022-11-03 08:14:07 +01:00
jelle spijker
ce8a7b6109 Create Artifactory build info 2022-11-03 07:50:57 +01:00
jelle spijker
b75e047348 Use ref.base_name for pr 2022-11-02 22:01:19 +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
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
MariMakes
24c12fd3eb
Added Triage status label 
An attempt to improve responsiveness on feature requests.
 2022-11-01 13:23:08 +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
Remco Burema
45fb71e966 Engine should know to (not) offset the nozzles w.r.t. disallowed areas. 
part of CURA-9066
 2022-10-30 17:07:21 +01:00
Remco Burema
24bb1e96fa Fix unlinked brim settings behaviour. 
Some brim settings seemed to behave as if they where linked, when in fact for any extruder set to -1 the 'default extruder' was set by some hacky code that supposedly fixes a 'dissallowed area' issue, very likely also related to the skirt/brim settings. Since dissalowed area for skirt/brim will not be a thing anymore, at least in the front-end, due to CURA-9066 (the 'parent' jira ticket that was blocked by this bug); it was sinplest just to remove the hack altogether. (Otherwise we'd have to make an artificial distinction between -1 and None as it relates to 'Not Set/Used' versus 'Not Overridden', only to then force it back to -1 in situations that call for it -- like communicating to the engine.)

CURA-9553
 2022-10-30 11:09:12 +01:00
Jaime van Kessel
e8b99c8eed
Merge pull request #13680 from Ultimaker/Update-splash-screen 
Updated splashscreen
 2022-10-28 12:31:31 +02:00
Lorenzo Romagnoli
9a1eca50e4 Updated splashscreen 
Updated splash screen logo with new logo with capital M
 2022-10-28 12:02:55 +02:00
Joey de l'Arago
f8ede7527e
Merge pull request #13671 from Ultimaker/CURA-9808-update-ulti-maker-logo 
Update logo.svg
 2022-10-28 10:45:52 +02:00
Lorenzo Romagnoli
6e6b5cbbc4
Update logo.svg 2022-10-27 12:22:31 +02:00
Alex
79af58ef7e build: harden notify_on_print_profile_change.yml permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-10-26 16:36:55 +03:00
Jaime van Kessel
f7d854ac3a
Merge pull request #13651 from Ultimaker/PP-251_create_annealing_intent 
Create a resolve function on the "support_enable" setting
 2022-10-26 11:40:58 +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
Remco Burema
ab51bd699e Merge branch 'main' into brim_per_material_optimized_order 2022-10-25 17:31:13 +02: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
Remco Burema
7f4777fdf6 Fix unit-tests. 
part of CURA-9769
 2022-10-20 11:34:44 +02:00
Remco Burema
b4405d886b Reverse sorting, newer machines on top. 
Same brand or name, but with a higher number should generally be first, so reverse sorting.

CURA-9769
 2022-10-20 10:24:01 +02:00
jelle spijker
ec9dcc43b4 Update changelog 5.2.1 5.2.1 2022-10-19 16:08:53 +02:00
jelle spijker
6860c6777c Update conandata for the 5.2.1 release 
Fix translation:
- Italian (mea culpa)
- Chinese (我们很抱歉)
 2022-10-19 15:52:29 +02:00