3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
32026 commits 305 branches 270 tags 779 MiB
Commit graph

32026 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
j.spijker@ultimaker.com
bb69e4877a Add channel to build metadata on non-release branches 
Contributes to CURA-9365
 2022-07-15 11:11:38 +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
fb4f93f096
Correct grammar of this sentence 
It should really end in a period.

Discovered during work on CURA-9420.
 2022-07-15 10:40:05 +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
Jelle Spijker
c731ac7dfe Merge branch '5.1' into CURA-9459_standard_default_install_path 
# Conflicts:
#	conandata.yml
 2022-07-15 10:33:04 +02:00
c.lamboo
efce84284e Update translation strings 
The profile name in the translation string was hard coded to be prepended before the actual string. Put this in the translation string as some languages may change the position of this part of the sentence.
 2022-07-15 10:29:56 +02:00
Ghostkeeper
fb081aa30d
Merge branch '5.1' of https://github.com/Patola/Cura into Patola-5.1 2022-07-15 10:29:53 +02:00
Jelle Spijker
c37285f9c0 Merge branch '5.1' 2022-07-15 10:14:17 +02:00
j.spijker@ultimaker.com
73e7ba4046 Remove 5.1.0-beta from workflow 
Contributes to CURA-9365
 2022-07-15 10:13:51 +02:00
Joey de l'Arago
d39b6d15cd
Merge pull request #12764 from Ultimaker/CURA-9428 
Fix rendering issues when moving dialogs between screen with different scale settings
 2022-07-15 10:13:28 +02:00
j.spijker@ultimaker.com
0bbe2fed13 Remove 5.1.0-beta from workflow 
Contributes to CURA-9365
 2022-07-15 10:05:16 +02:00
Jelle Spijker
3def77416d Merge branch '5.1' 2022-07-15 10:04:26 +02:00
j.spijker@ultimaker.com
a0d775b90e Update workflows 
Contributes to CURA-9365
 2022-07-15 10:03:37 +02:00
j.spijker@ultimaker.com
17748d0a9a print boolean to lower case 
Contributes to CURA-9365
 2022-07-15 09:07:37 +02:00
j.spijker@ultimaker.com
a75596f97c bool is_release_branch added 
Contributes to CURA-9365
 2022-07-15 08:58:09 +02:00
j.spijker@ultimaker.com
2b808daa4e Add major_minor output for easier release branch detection 
Contributes to CURA-9365
 2022-07-15 08:34:30 +02:00
j.spijker@ultimaker.com
dbc62492e7 Use latest for beta 
Contributes to CURA-9365
 2022-07-15 08:00:19 +02:00
j.spijker@ultimaker.com
3edd748c50 Use reqs for 5.1.0-beta 
Contributes to CURA-9365

(cherry picked from commit 12eb5f15d1)
 2022-07-15 07:59:19 +02:00
j.spijker@ultimaker.com
310fb48f87 Add specific branch req 
Contributes to CURA-9365
 2022-07-15 07:58:48 +02:00
j.spijker@ultimaker.com
b9b13b0d69 Use reqs for 5.1.0-beta 
Contributes to CURA-9365

(cherry picked from commit 12eb5f15d1)
 2022-07-15 07:57:07 +02:00
Jelle Spijker
363f65211e Merge branch '5.1' into CURA-9459_standard_default_install_path 2022-07-15 07:56:26 +02:00
j.spijker@ultimaker.com
12eb5f15d1 Use reqs for 5.1.0-beta 
Contributes to CURA-9365
 2022-07-15 07:55:05 +02:00
c.lamboo
35fce917c6 Use UM.Window in the material sync dialog and the preference pages 
CURA-9428
 2022-07-15 07:25:54 +02:00
j.spijker@ultimaker.com
6645d6fe94
Use umbase 0.1.4 
Contributes to CURA-9365
 2022-07-14 18:22:47 +02:00
j.spijker@ultimaker.com
8f1ad7e6b4
Use umbase 0.1.4 
Contributes to CURA-9365
 2022-07-14 18:21:55 +02:00
j.spijker@ultimaker.com
3ea7dd8565
Use umbase 0.1.4 
Contributes to CURA-9365
 2022-07-14 18:21:23 +02:00
Jelle Spijker
4093e1e808
Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-14 17:39:28 +02:00
Jelle Spijker
1a0ecfd850
Merge branch '5.1' 
# Conflicts:
#	.github/workflows/conan-package.yml
#	.github/workflows/cura-installer.yml
 2022-07-14 16:30:52 +02:00
j.spijker@ultimaker.com
e0c7259149
Notify on success 
Contributes to CURA-9365
 2022-07-14 16:28:08 +02:00
j.spijker@ultimaker.com
77979c384d
Lowercase username 
Contributes to CURA-9365

(cherry picked from commit f5a559179b)
 2022-07-14 15:47:24 +02:00
j.spijker@ultimaker.com
f5a559179b
Lowercase username 
Contributes to CURA-9365
 2022-07-14 14:55:54 +02:00
j.spijker@ultimaker.com
409c079d8f
Simplified nsis script 
Contributes to CURA-9365
 2022-07-14 14:47:58 +02:00
j.spijker@ultimaker.com
b0f9c6bb28
Use the full app name 
I believe this should ensure that specific
folders and location will then have a unique
path for this app in the registry, which
should make the install path version specific

Contributes to CURA-9365
 2022-07-14 12:47:39 +02:00
j.spijker@ultimaker.com
95a8de45ee
Use testing channel as a default 
Contributes to CURA-9365
 2022-07-14 10:40:23 +02:00
j.spijker@ultimaker.com
7068c87130
Add copied openssl 1.1.1l binaries to pyinstall binaries 
Contributes to CURA-9342
 2022-07-14 10:38:59 +02:00