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

29960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
68aec6f064
Bump version number 
CURA-9500
 2022-07-19 14:37:27 +02:00
Jaime van Kessel
7e811025fb
Merge branch 'feat/ender3s1-profile' of github.com:Sebazzz/Cura 2022-07-19 14:34:42 +02:00
c.lamboo
3dad5d564d Only unquote once in getMaterialFilePackageId 5.1.0 2022-07-19 14:12:35 +02:00
c.lamboo
a6b15d27b7 Merge remote-tracking branch 'origin/5.1' into 5.1 2022-07-19 13:54:42 +02:00
c.lamboo
1e9e3a8cfb Fix saving materials with spaces 2022-07-19 13:54:32 +02:00
Casper Lamboo
9b5cf07269
Merge pull request #12795 from Ultimaker/CURA-9342_add_missing_openssl_1_1_1l_shared_library 
Cura 9342 add missing openssl 1 1 1l shared library
 2022-07-19 13:03:29 +02:00
Jelle Spijker
ce8eb1056c
Add Path to the imports 2022-07-19 11:16:34 +02:00
jspijker
ebf7fb000b Merge branch '5.1' 2022-07-19 10:48:03 +02:00
jspijker
ee10141691 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 
# Conflicts:
#	conandata.yml
 2022-07-19 10:47:26 +02:00
j.spijker@ultimaker.com
c8ce7bcb9d Use latest for stable channel 
Contributes to CURA-9365
 2022-07-19 10:44:56 +02:00
jspijker
79fe069d20 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 10:34:45 +02:00
jspijker
1b427ac2a4 Merge branch '5.1' 2022-07-19 10:33:42 +02:00
j.spijker@ultimaker.com
3609871ba6 Use umbase 0.1.5 
Contributes to CURA-9365
 2022-07-19 10:33:04 +02:00
Ghostkeeper
e92e815226
Add video link for 5.1 2022-07-19 10:09:09 +02:00
jspijker
2b4b110b38 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 09:54:18 +02:00
jspijker
a8c2a24f14 Merge branch '5.1' 2022-07-19 09:53:45 +02:00
j.spijker@ultimaker.com
1c3a46c9e2 Use empty string for channel if channel is undefined 
Contributes to CURA-9365
 2022-07-19 09:52:54 +02:00
jspijker
470e56ddaf Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 09:05:49 +02:00
jspijker
a4065f29d5 Merge branch '5.1' 2022-07-19 09:05:13 +02:00
j.spijker@ultimaker.com
8f87744cd5 Pinned arcus, savitar and pynest2d to release 
Contributes to CURA-9365
 2022-07-19 09:04:06 +02:00
j.spijker@ultimaker.com
c463f2e9d6 use beta instead of alpha 
Contributes to CURA-9365
 2022-07-19 08:48:25 +02:00
j.spijker@ultimaker.com
d9cc8ca19b Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
 2022-07-19 08:36:17 +02:00
j.spijker@ultimaker.com
0397a95381 Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
 2022-07-19 08:36:03 +02:00
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 03285f80fc51c47e6ac96c24b85aa4ebf99251c1)
 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.
5.0.99 		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