Commit graph

31264 commits

Author SHA1 Message Date
c.lamboo
8a905fcb7d Merge remote-tracking branch 'origin/CURA-9365_fix_building_cura_main' into CURA-9365_fix_building_cura_main 2022-06-27 15:47:03 +02:00
c.lamboo
a967462038 Add res folder to resource folder
CURA-9365
2022-06-27 15:39:48 +02:00
j.spijker@ultimaker.com
62aacc5946 Initial set-up of deploy functionality
Contributes to CURA-9365
2022-06-27 13:51:50 +02:00
Ghostkeeper
96192adce2
Catch wrong cloud responses when it responds with a new file name
It could happen if there are bugs in the cloud, e.g. if they strip special characters somewhere.
We'd want to know it if they do. But we also don't want Cura to crash if the remote connection is not reliable, or if there's changes/bugs in the future.

Fixes Sentry issue CURA-42F.
2022-06-27 11:30:38 +02:00
Casper Lamboo
fd09bcfb9b
Merge pull request #12476 from Ultimaker/CURA-9271
[CURA-9271] Build plate shrinks when using horizontal scaling shrinkage compensation
2022-06-27 09:09:37 +02:00
AnnaKang0219
1d5523bbd3 Add acceleration_infill & acceleration_wall
Add acceleration_infill & acceleration_wall
and modify speed_travel
2022-06-27 09:17:57 +08:00
Jelle Spijker
fab8598a05 Add numpy-stl to hidden-imports
Fixes #10696

Contributes to CURA-9365
2022-06-26 11:18:53 +02:00
Jelle Spijker
5090626144 Added python-utils and six to requirements
These are dependencies of numpy-stl

Contributes to CURA-9365
2022-06-26 11:14:59 +02:00
Jelle Spijker
ed9cdb6b34 Added Numpy-stl to requirements
Relates to GH issue #10696
TODO: double check if we need to specify it manualy for pyinstaller to collect

Contributes to CURA-9365
2022-06-26 10:55:29 +02:00
Jelle Spijker
ced7a6fde2 Added PyQt6-sip to requirements
Contributes to CURA-9365
2022-06-26 10:49:02 +02:00
j.spijker@ultimaker.com
815160f45f
Build CPython shared
Contributes to CURA-9365
2022-06-25 18:56:13 +02:00
j.spijker@ultimaker.com
5f6d59c63d
Only build Arcus, Savitar and pynest2d shared
Contributes to CURA-9365
2022-06-25 18:40:27 +02:00
naveen
7fcf876a91 chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-06-25 00:31:53 +00:00
Casper Lamboo
651c0afa11
Merge pull request #12585 from Ultimaker/CURA-9412_saving_with_no_material_fails
[CURA-9412] Project file saving fails on printers without materials
2022-06-24 15:15:01 +02:00
j.delarago
41cc78af1a Add at a minumum a very small border around the edges of the build plate. Otherwise models with shrinkage compensation (or any model with disallowed areas around it) can be placed so that the output model is off the build plate.
CURA-9271
2022-06-24 15:00:42 +02:00
c.lamboo
2c074fb7a3 Don't show scary error message when saving custom file
CURA-9414
2022-06-24 14:52:42 +02:00
j.delarago
9aaf59ae86 Suggested changes
CURA-9412
2022-06-24 14:29:50 +02:00
Jaime van Kessel
7685540709 Ensure that intents and variants are also copied from packages
Although we only really need the intents, it doesn't hurt to also include the variants.
No idea if we will ever need or use it, but we might as well add it now.

CURA-7667
2022-06-23 14:14:22 +02:00
j.spijker@ultimaker.com
30135072de Compile cpython dependencies statically
Contributes to CURA-9365
2022-06-23 12:58:09 +02:00
j.spijker@ultimaker.com
f58389d599 Build on the current branch
for testing purposes

Contributes to CURA-9365
2022-06-23 09:27:34 +02:00
j.spijker@ultimaker.com
6fff497183 Use latest fdm_materials and cura_binary_data
Contributes to CURA-9365
2022-06-23 09:25:45 +02:00
j.spijker@ultimaker.com
35981219b1 sync workflow across repo's
Contributes to CURA-9365
2022-06-23 09:12:15 +02:00
j.spijker@ultimaker.com
06f6ce1eff Only create alias on PR's
Contributes to CURA-9365
2022-06-23 07:36:58 +02:00
j.spijker@ultimaker.com
b0448006c1 Fix incomplete user/channel broadcast
Contributes to CURA-9365
2022-06-23 07:22:07 +02:00
j.spijker@ultimaker.com
1c7033f312 Add manual trigger for the workflow
This will only work once present on main branch

Contributes to CURA-9365
2022-06-23 07:10:56 +02:00
j.spijker@ultimaker.com
706d93fbd3 Cleaned up release/channel logic
Contributes to CURA-9365
2022-06-23 06:52:36 +02:00
j.spijker@ultimaker.com
2781725cea Use latest alias
Contributes to CURA-9365
2022-06-22 19:18:04 +02:00
j.spijker@ultimaker.com
f7c361f61e use mpdecimal 2.5.0
The Python recipe has some problems with version 2.5.1

fff8ccc29b/recipes/cpython/all/conanfile.py (L187)

Contributes to CURA-9365
2022-06-22 17:15:14 +02:00
Ghostkeeper
1df76d8cc5
Correct Dutch translations of Marketplace
Marketplace is considered a product by Ultimaker, and so it should not be translated. In Dutch this was inconsistently translated (or not translated).

Found by one of the translators in CURA-9420.
2022-06-22 17:00:22 +02:00
j.spijker@ultimaker.com
95c1a03cb5 pin fm_materials and cura_binary_data
Contributes to CURA-9365
2022-06-22 14:24:27 +02:00
j.delarago
dd3abf7ff0 Add check for empty material instance containers before trying to fetch material metadata. This fixes failing to save a project on a printer with no materials (UM2 for example).
CURA-9412
2022-06-22 14:05:56 +02:00
j.spijker@ultimaker.com
cc814afaa3 don't use prereleasenumber
Contributes to CURA-9365
2022-06-22 13:21:40 +02:00
j.spijker@ultimaker.com
0b9a49f7c9 Trigger on release branch and when gitversion changes
Contributes to CURA-9365
2022-06-22 12:28:12 +02:00
Ghostkeeper
ac67dcc045
Don't cache PluginRegistry instance
Several reasons:
* It's bad style, making it harder to test with mocked PluginRegistry since all sorts of objects have copies of the un-mocked object in their fields.
* It's causing errors in this case when checkIfRestartNeeded is called before show().

Fixes Sentry issue CURA-3P6.
2022-06-22 11:52:13 +02:00
Jelle Spijker
be5ed20f8f Use Conan download cache
to limit to amount of transfer to/from server

Contributes to CURA-9365
2022-06-22 11:14:07 +02:00
j.delarago
c118bd4e29 Adjust space between configuration warning and resolution options to closer match design.
CURA-8849
2022-06-22 11:13:50 +02:00
j.spijker@ultimaker.com
803858c4e9 Cheating with Arcus
Contributes to CURA-9365
2022-06-22 11:04:12 +02:00
j.spijker@ultimaker.com
46929ad302 Invert failure bool for notify
Contributes to CURA-9365
2022-06-22 10:51:51 +02:00
j.spijker@ultimaker.com
fdbac4cccb trigger workflow when conanfile.py and conandata.yml changes
Contributes to CURA-9365
2022-06-22 09:29:58 +02:00
j.spijker@ultimaker.com
ee87a2e3a4 use umbase 0.1.1 or higher
Contributes to CURA-9365
2022-06-22 09:28:52 +02:00
j.spijker@ultimaker.com
6ca96814a8 Fix parser logic
Contributes to CURA-9365
2022-06-22 08:57:02 +02:00
j.spijker@ultimaker.com
4c4c6bb5da fixed latest step
Contributes to CURA-9365
2022-06-22 08:52:46 +02:00
j.spijker@ultimaker.com
f746708c8e fix typo
Contributes to CURA-9365
2022-06-22 08:48:34 +02:00
j.spijker@ultimaker.com
a80543aa4c use only semver pre-release-tags
Contributes to CURA-9365
2022-06-22 08:46:06 +02:00
j.spijker@ultimaker.com
399bff8bf6 Remove reference to curaengine from step name
Contributes to CURA-9365
2022-06-22 08:04:10 +02:00
j.spijker@ultimaker.com
24f1170c29 treat input success and failure as boolean
Contributes to CURA-9365
2022-06-22 08:02:19 +02:00
j.spijker@ultimaker.com
5616bae098 Cache to arch specific key
Contributes to CURA-9365
2022-06-22 06:58:26 +02:00
Ghostkeeper
a17b68b17d
Merge branch 'CURA-9420_translations_5.1' 2022-06-21 17:56:43 +02:00
j.spijker@ultimaker.com
c135173e67 No need to sanitize user
Contributes to CURA-9365
2022-06-21 17:14:42 +02:00
j.spijker@ultimaker.com
73c3bd2126 Remove release branch trigger
Contributes to CURA-9365
2022-06-21 17:09:12 +02:00