GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 14:59:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,615 Commits 295 Branches 268 Tags
Commit Graph

29615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle Spijker
6aa68ddb33 Improved readability of changelog 5.1.1 2022-09-07 11:05:39 +02:00
Jelle Spijker
b69eb0180e Use conf to obtain configuration 
Contributes to CURA-8831
 2022-09-07 10:34:04 +02:00
jelle Spijker
770307d53a Allow specifying version with conan conf 
By setting the `user.cura:version` in the
configuration of Conan that version string
is used preferred over the actual version

This should be usefully for releases

Contributes to CURA-8831
 2022-09-07 07:49:21 +02:00
jelle Spijker
656238d5f2 Updated changelog with new features 
Closes CURA-9525
 2022-09-06 16:54:49 +02:00
j.spijker@ultimaker.com
2086bbfc49 Use workflow fixes from main 2022-09-06 15:25:18 +02:00
j.spijker@ultimaker.com
e164efeca4 Use conanfile fixes from main 2022-09-06 15:16:17 +02:00
j.spijker@ultimaker.com
e704d4db42 Add 5.1.1 entry to conan_data 2022-09-06 15:02:54 +02:00
Jaime van Kessel
2734005f36 Add extra BOM numbers to UMs3 and UMs5 2022-09-06 15:01:32 +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
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
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
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
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
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
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
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
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
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
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
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
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
Casper Lamboo
a8a8b6751a
Merge pull request #12700 from sustmi/czech-translations-v5.1 
Czech translations for v5.1
 2022-07-15 10:43:42 +02:00
Ghostkeeper
f210e98fb7
Merge branch '5.1' of github.com:Ultimaker/Cura into 5.1 2022-07-15 10:36:07 +02:00
Ghostkeeper
dcd792c34c
Fix capital letter of Parser 
It's in a column of descriptions where each description starts with a capital letter. However in this case the translator couldn't have known that it needs to start with a capital letter since JSON is allcaps anyway.

Contributes to issue CURA-9420.
 2022-07-15 10:35:19 +02:00