3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
30574 commits 313 branches 275 tags 718 MiB
Commit graph

30574 commits

This branch
This branch
All branches
Author SHA1 Message Date
Remco Burema
c9fc171776
Merge pull request #13596 from Ultimaker/boyscout_translations_conan_package 
Build mo translation files when creating conan package
 2022-11-11 13:44:33 +01:00
Remco Burema
571adbb25f
Merge pull request #13790 from Ultimaker/CURA-9876_per_object_retract_PR 
[CURA-9876] Expose per-model retraction settings.
 2022-11-11 11:51:45 +01:00
Joey de l'Arago
ebbefb5439
Merge pull request #13718 from discip/patch-2 
minor fixes + layer_no instead of height
 2022-11-11 11:17:22 +01:00
Remco Burema
57c6a228aa Expose per-model retraction settings. 
Related engine PR made it possible to do this. No PR was made to expose these to the front-end as far as I can see, so (since this was a PRwe where very behind on -- like 10 months or so) I choose to do it myself instead of asking the original author.

part of CURA-9876
 2022-11-11 11:02:05 +01:00
Joey de l'Arago
bba5532a83
Merge pull request #13608 from StuSerious/work/cff 
Update CITATION.cff to 5.2.1
 2022-11-11 10:38:41 +01:00
jspijker
4830479b63 Also map plugins folder in conandata.yml 2022-11-10 11:34:46 +01:00
Casper Lamboo
71398596ed
Merge pull request #13778 from Ultimaker/fix_conan_private_data 
Fix internal data plugins deployment
 2022-11-09 21:13:32 +01:00
jspijker
65f7769e58 Fix internal data plugins deployment 
The conan package from the internal package wasn't deployed,
added the logic for the second list item
 2022-11-09 20:15:23 +01:00
Casper Lamboo
db57c8fb43
Merge pull request #13772 from Ultimaker/CURA-8689_add_first_cloud_printer_tweaks 
Cura 8689 add first cloud printer tweaks
 2022-11-09 14:55:29 +01:00
c.lamboo
efe86c27b0 Merge remote-tracking branch 'origin/CURA-8689_add_first_cloud_printer_tweaks' into CURA-8689_add_first_cloud_printer_tweaks 2022-11-09 14:02:49 +01:00
c.lamboo
f73d192d65 Use Label for each individual step in add UltiMaker printer 
CURA-8689
 2022-11-09 14:02:43 +01:00
jspijker
f1c8d3d9e0 Show busy indicator 
Contributes to CURA-8689
 2022-11-09 13:47:32 +01:00
c.lamboo
7639b0ba19 Center align UltiMaker onboarding wizzard-text 
CURA-8689
 2022-11-09 13:29:33 +01:00
jspijker
92fb7fd1a6 Show the add printer dialog in the browser 
Contributes to CURA-8689
 2022-11-09 11:14:28 +01:00
jspijker
adf2c16360 Fixed printer buttons conform UX design 
Contributes to CURA-8689
 2022-11-09 11:13:40 +01:00
Remco Burema
3d645140f2 Fix: Sort updateables on top of others instead of vice-versa. 2022-11-09 10:37:49 +01:00
jspijker
f2147bb259 Enumerate steps 
Contributes to CURA-8689
 2022-11-09 10:09:22 +01:00
jspijker
2ef0c3d163 Don't trigger third-party printer dialog when onCloudPrintersDetected changed 
That signal is received basically every minute when you're already signed in
and it will close the dialog when no new cloud printers are found.

Contributes to CURA-8689
 2022-11-09 07:40:44 +01:00
jspijker
e9a1806570 Allign "learn more" left-side 
Contributes to CURA-8689
 2022-11-09 07:28:46 +01:00
jspijker
a3f259d004 Send user to external DF printer page 
Contributes to CURA-8689
 2022-11-08 18:27:09 +01:00
jspijker
f0966b1c57 Don't stretch in height and adhere border to UX design 
Contributes to CURA-8689
 2022-11-08 18:17:41 +01:00
Jelle Spijker
00bdd9d72c
Merge pull request #13705 from Ultimaker/feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 
Make it easier to add your first printer via cloud
 2022-11-08 11:48:53 +01:00
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 6ddc16709b.
 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 61a491f910.
 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
50fad9caf4 Only translate when option devtools is set 2022-11-03 07:18:26 +01:00
discip
d5099111bb
minor fixes + layer_no instead of height 2022-11-03 00:45:42 +01:00
jspijker
6deb1d8968 Merge branch 'main' into boyscout_translations_conan_package 2022-11-02 22:11:32 +01:00
jelle spijker
b75e047348 Use ref.base_name for pr 2022-11-02 22:01:19 +01:00
jelle spijker
fc26413347 Check against str for conf_info bash path 2022-11-02 21:16:18 +01:00