3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
29784 commits 306 branches 272 tags 787 MiB
Commit graph

29784 commits

This branch
This branch
All branches
Author SHA1 Message Date
j.spijker@ultimaker.com
3b1de601d4 Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365

(cherry picked from commit 03285f80fc)
 2022-07-19 08:28:07 +02:00
j.spijker@ultimaker.com
03285f80fc Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
 2022-07-19 08:26:49 +02:00
j.spijker@ultimaker.com
9569e33b52 Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
 2022-07-19 08:03:45 +02:00
j.spijker@ultimaker.com
e4001798de Update reqs in conandata 
Contributes to CURA-9365
 2022-07-19 07:58:05 +02:00
jspijker
d73aa62d6f Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 
# Conflicts:
#	conandata.yml
 2022-07-19 07:54:32 +02:00
j.spijker@ultimaker.com
cf77f9073e Fixed wrong context 
Contributes to CURA-9365
 2022-07-19 07:50:34 +02:00
j.spijker@ultimaker.com
68fd824ee3 fixed typo 
Contributes to CURA-9365
 2022-07-19 07:48:42 +02:00
j.spijker@ultimaker.com
1253adf31c Only remove alias on Linux 
Contributes to CURA-9365
 2022-07-19 07:46:56 +02:00
j.spijker@ultimaker.com
fe8686438d Only upload ultimaker and _ to artifactory 
Contributes to CURA-9365
 2022-07-19 07:45:17 +02:00
j.spijker@ultimaker.com
be361366b3 treat it as a boolean 
Contributes to CURA-9365
 2022-07-19 07:39:41 +02:00
j.spijker@ultimaker.com
788606cb51 Only remove the binaries with pure export step 
Contributes to CURA-9365
 2022-07-19 07:36:57 +02:00
j.spijker@ultimaker.com
0b7fe4790b Allow remove alias to fail 
Contributes to CURA-9365
 2022-07-19 07:29:24 +02:00
j.spijker@ultimaker.com
34fccedd03 Only remove remote aliases 
Contributes to CURA-9365
 2022-07-19 07:02:29 +02:00
j.spijker@ultimaker.com
3c9541a6a9 Clean-up latest before creation and upload 
Contributes to CURA-9365
 2022-07-19 06:57:42 +02:00
j.spijker@ultimaker.com
4e55603bde Set channel and user to _ for tag 
Contributes to CURA-9365
 2022-07-19 06:50:39 +02:00
Ghostkeeper
9ec9ef67a9
Merge branch '5.1' 2022-07-18 14:55:50 +02:00
Ghostkeeper
e40991fcc3
Add missing feature to change log 
This was actually completed quite a while ago (not in 5.0 yet, but in 5.1) but testing completed way later, making us miss this one.
 2022-07-18 14:55:30 +02:00
j.spijker@ultimaker.com
cd303b4e6f Make sure all dynamic libs are copied to the dist 
Solve it dynamically in the Ultimaker-Cura.spec,
Such that we can copy files manually (OpenSSL shared)
to the bin/Script folder after the cura install step.

Contributes to CURA-9342
 2022-07-18 11:34:21 +02:00
Joey de l'Arago
d1453c5f69
Merge pull request #12769 from Ultimaker/CURA-9365_add_conan_info_to_log 
CURA 9365 add conan info to log
 2022-07-18 11:06:53 +02:00
Ghostkeeper
aeae08645b
Merge branch '5.1' 
Conflicts:
	conandata.yml -> something was added in 5.1, so I kept that. Not sure why it'd be a conflict.
 2022-07-18 10:58:17 +02:00
Ghostkeeper
a061024572
Add 'known issues' section of change log 
I really hope this won't become a pattern... We've always had known issues and it wouldn't do anyone any good to list all of them in the stable release change logs. But it's not my decision here.
 2022-07-18 10:56:07 +02:00
Joey de l'Arago
26ac80ffbf
Merge pull request #12767 from Ultimaker/CURA-8665_add_prerelease_tag_to_install_dir 
CURA-8665 and CURA-9459 lock default install dir and use full semver for the install folder
 2022-07-18 10:42:50 +02:00
c.lamboo
eff2ced117 Merge remote-tracking branch 'origin/main' 2022-07-18 10:40:47 +02:00
c.lamboo
0afab9f9e9 Add label-string to translations 2022-07-18 10:40:41 +02:00
Ghostkeeper
3c6a2e6dc5
Merge branch '5.1' 2022-07-18 10:36:36 +02:00
Jelle Spijker
470bb7300c
Update documentation 
Clarify why the last two items are removed from the list
 2022-07-18 10:35:55 +02:00
Ghostkeeper
0d3ca30228
Update change log for 5.1 stable 
There's still 2 more tickets in the works, that I didn't add yet. We'll see if they get merged in time.
 2022-07-18 10:35:34 +02:00
j.spijker@ultimaker.com
798facd63b Add pkg-config to Linux system reqs 
Is needed to build CPython and it wasn't installed

Contributes to CURA-9342
 2022-07-18 10:01:24 +02:00
Jelle Spijker
e62e1e7401
Move one directory up 
Contributes to CURA-9365
 2022-07-15 17:42:26 +02:00
j.spijker@ultimaker.com
1e4fe93d64
Output to log if no conan_install_info.json was found 
Contributes to CURA-9365
 2022-07-15 17:41:59 +02:00
j.spijker@ultimaker.com
7f27058a6b
Output the Conan Info to the logs 
Contributes to CURA-9365
 2022-07-15 17:37:37 +02:00
j.spijker@ultimaker.com
0c658ccbc5
Reads the conan_install_info int ApplicationMetadata 
Contributes to CURA-9365
 2022-07-15 17:04:26 +02:00
Jelle Spijker
5dbef74e22 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-15 15:46:10 +02:00
Jelle Spijker
b969764c1c Merge branch '5.1' into CURA-8665_add_prerelease_tag_to_install_dir 2022-07-15 14:22:19 +02:00
j.spijker@ultimaker.com
b896f1124a Use Ultimaker Cura as default start menu folder 
Contributes to CURA-9459
 2022-07-15 14:11:16 +02:00
Jelle Spijker
298181abc6 Revert "Limit the number of commits to checkout to 3000" 
This reverts commit 0793572dc3.
 2022-07-15 13:57:49 +02:00
Jelle Spijker
e179e15f4a Merge branch '5.1' 
# Conflicts:
#	.github/workflows/unit-test.yml
 2022-07-15 13:53:13 +02:00
j.spijker@ultimaker.com
0793572dc3 Limit the number of commits to checkout to 3000 
Should speed up this workflow

Seems like a reasonable number (for Cura) at the
time of writing that would include up until 4.13.1

Contributes to CURA-9459
 2022-07-15 13:52:21 +02:00
j.spijker@ultimaker.com
c01410146d Checkout the repo, needed by setup python 
Contributes to CURA-9459
 2022-07-15 13:44:12 +02:00
j.spijker@ultimaker.com
b2531c851f Run unit tests as a composite action 
To avoid conflicts between the Cura Python modules and the
EnricoMi/publish-unit-test-result-action

Contributes to CURA-9459
 2022-07-15 13:39:36 +02:00
j.spijker@ultimaker.com
b7316f4503 Use full version in app_name 
This should ensure that each Cura version, either release, prerelease or development
Will be installed completely separate from earlier versions

Contributes to CURA-9459
 2022-07-15 13:25:03 +02:00
j.spijker@ultimaker.com
49161aa4be Add cura_8665 entry to conandata 
Contributes to CURA-9459
 2022-07-15 13:23:15 +02:00
j.spijker@ultimaker.com
82c6035754 Remove the InstallDirRegKey 
This should ensure that the default directory will always falls back to
`"$PROGRAMFILES64\${APP_NAME}"` where `APP_NAME` is:
`{{ app_name }} {{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}`

Contributes to CURA-9459
 2022-07-15 13:07:21 +02:00
j.spijker@ultimaker.com
f1a6c54414 Fixed nsis build script 
Contributes to CURA-9365
 2022-07-15 12:03:51 +02:00
j.spijker@ultimaker.com
d1385a809a Fix buildmetadata containing stable 
Contributes to CURA-9365
 2022-07-15 11:53:51 +02:00
c.lamboo
0c322a67c6 Merge remote-tracking branch 'origin/5.1' into 5.1 2022-07-15 11:42:46 +02:00
c.lamboo
2318b0dd5e Remove line break in translation string 
CURA-9420
 2022-07-15 11:42:27 +02:00
Ghostkeeper
ed60657b1d
Fix whitespace around slash 
This was inconsistent with other uses in Chinese and just in and of itself.

Contributes to issue CURA-9420.
 2022-07-15 11:40:38 +02:00
c.lamboo
e1b640528d Update translation strings 
CURA-9420
 2022-07-15 11:20:21 +02:00
j.spijker@ultimaker.com
7568a897a0 Fix wrong indention 
Contributes to CURA-9365
 2022-07-15 11:15:07 +02:00