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
31424 commits 305 branches 270 tags 779 MiB
Commit graph

31424 commits

This branch
This branch
All branches
Author SHA1 Message Date
j.spijker@ultimaker.com
17d1d95217 Add the conan-package workflow 
Contributes to CURA-9365
 2022-06-17 18:15:14 +02:00
j.spijker@ultimaker.com
aaed543a22 Add entrypoint info to conandata 
With the new PyCharmRunEnv generate conan
should automatically create a pycahrm run
target, setting the paths correctly.

Usage as: `conan instal ....... -g PyCharmRunEnv`

Contributes to CURA-9365
 2022-06-17 18:12:22 +02:00
Jaime van Kessel
f474381425 Fix multiple issues with profiles 
That's what you get from not having tests running remote.
 2022-06-17 16:06:24 +02:00
Jaime van Kessel
e38059b7c0 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:58:11 +02:00
Jaime van Kessel
3101f2aea4 Remove filter_out_tiny_gaps from definitions 
This setting doesn't exist anymore.
 2022-06-17 15:57:40 +02:00
Jaime van Kessel
c6a3fb3ae4 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:54:47 +02:00
Jaime van Kessel
3689c097f3 Re-add accidentally removed setting 2022-06-17 15:54:23 +02:00
Jaime van Kessel
85eb0fedcd Fix Convex hull decorator tests 2022-06-17 15:50:04 +02:00
Jaime van Kessel
6956a4ad37 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-17 15:37:56 +02:00
Jaime van Kessel
f82e49e2dd Merge branch 'fix_material_diameter_profiles' of github.com:fieldOfView/Cura into 5.1 2022-06-17 15:35:32 +02:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage 
This only needs to happen in code that uses PyQt, not in qml code
 2022-06-17 15:26:30 +02:00
Jaime van Kessel
d05417f7f0 Remove duplicated code 
CURA-9352
 2022-06-17 15:22:33 +02:00
Jaime van Kessel
3514c01b25 Remove duplicated code 
CURA-9352
 2022-06-17 15:21:30 +02:00
j.delarago
f650579799 PrintQuality icon is slightly too right aligned due to the icon not filling the entire svg. 
There is no additional margin on the left that can be removed, so instead I've given it a small negative margin

CURA-8849
 2022-06-17 15:02:45 +02:00
Jelle Spijker
f6aa409701 Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main 2022-06-17 10:01:04 +02:00
j.spijker@ultimaker.com
f9447edf47 Remove materials before import 
This ensures that there won't be any old materials present
if they're deleted between versions.

Contributes to CURA-9365
 2022-06-17 08:22:30 +02:00
j.spijker@ultimaker.com
e6bfea7c81 import fdm_materials 
Contributes to CURA-9365
 2022-06-17 07:59:05 +02:00
j.spijker@ultimaker.com
8d03f0c665 Use Cura source folder for pyinstaller 
Contributes to CURA-9365
 2022-06-17 07:33:08 +02:00
j.spijker@ultimaker.com
2044ff2d6a import the fdm_materials 
Contributes to CURA-9365
 2022-06-17 07:32:18 +02:00
j.spijker@ultimaker.com
cd3bb71f6f Use semver compatible range modifier 
https://docs.conan.io/en/latest/versioning/version_ranges.html

It won't match build metadata otherwise.

The order of search for matching versions is as follows:

First, the local conan storage is searched for matching versions, unless the --update flag is provided to conan install.
If a matching version is found, it is used in the dependency graph as a solution.
If no matching version is locally found, it starts to search in the remotes, in order. If some remote is specified with -r=remote, then only that remote will be used.
If the --update parameter is used, then the existing packages in the local conan cache will not be used, and the same search of the previous steps is carried out in the remotes. If new matching versions are found, they will be retrieved, so subsequent calls to install will find them locally and use them.

Contributes to CURA-9365
 2022-06-17 07:19:53 +02:00
j.spijker@ultimaker.com
6cbc9aaa38 Use only pip in conan requirements 
No longer download and mess with sources from
other repo's.

Created Conan packages for cura-binary-data,
fdm_materials and uranium.

Charon is installed with pip. I had to create
a separate requirement file for that since
you can't mix and match git and hashes.

Contributes to CURA-9365
 2022-06-16 19:55:56 +02:00
Casper Lamboo
50a3511496
Merge pull request #12542 from Ultimaker/CURA-8849_intent_selection_fixes 
[CURA-8849] Intent selection fixes
 2022-06-16 15:55:32 +02:00
j.delarago
9dff733345 Remove todos that are no longer applicable 
Remove debug print statement

CURA-9321
 2022-06-16 15:32:33 +02:00
j.delarago
1a464051d4 On initial startup, when assigning your first printer the ActiveIntentQualitiesModel.py would not be updated. Causing an error unsupported configuration to show. 
Fixed by updating the model when the globalContainer is changed as well.

CURA-8849
 2022-06-16 14:27:13 +02:00
j.delarago
cc58b362fc Add text wrapping for very long custom profile names. 
CURA-8849
 2022-06-16 14:19:39 +02:00
j.delarago
0fb2b46677 Intent button was showing when only a single intent is available. 
This was caused by visible being overridden.

CURA-8849
 2022-06-16 14:05:39 +02:00
j.delarago
1e0236e317 Remove left margins which don't align with the intended design. 
CURA-8849
 2022-06-16 13:56:46 +02:00
j.delarago
689547f125 We are using recommendedResolutionSelector._previousResolution to see if the resolution had changed before highlighting the resolution selector. This updates when intents change but not when qualities change. 
I tried updating when the qualities change but this was updating before this line
if(recommendedResolutionSelector._previousResolution !== Cura.MachineManager.activeQualityType)
which caused this always to resolve as true

The solution was to update _previousResolution after we select an item in the drop down.

CURA-8849
 2022-06-16 13:49:30 +02:00
j.delarago
1e5f6bce72 Increase margins on warning to match design 
CURA-8849
 2022-06-16 13:23:50 +02:00
j.delarago
7d8fdf8bdd Items in intent selection settings column were not filling width, the result of this was any item with more than one child would have these children squished together. 
Fix is to have the children fill their width

CURA-8849
 2022-06-16 13:12:36 +02:00
Joey de l'Arago
88168bc0e1
Merge pull request #12532 from Ultimaker/PP-116_clean-up-DD-variant-profile 
Pp 166 clean up dd variant profile
 2022-06-16 11:08:50 +02:00
Jelle Spijker
b8a4243e26 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-16 10:48:41 +02:00
Jaime van Kessel
ac32f3b625
Merge pull request #12530 from Ultimaker/CURA-8610_save_required_packages_metadata 
[CURA-8610] save required packages metadata
 2022-06-16 10:47:06 +02:00
j.delarago
8c92ebfccd Add missing import 
CURA-8849
 2022-06-16 10:41:06 +02:00
Jelle Spijker
d9b9959346 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-16 09:54:20 +02:00
j.spijker@ultimaker.com
8ce661b062 Add GitVersion 
Contributes to CURA-9365
 2022-06-16 09:54:03 +02:00
Jaime van Kessel
d30afb6647
Merge pull request #12534 from StuSerious/main 
Enhance CITATION.cff
 2022-06-16 09:29:10 +02:00
j.spijker@ultimaker.com
b364f512d8 Use string as type for body 
Contributes to CURA-9365
 2022-06-16 07:16:47 +02:00
j.spijker@ultimaker.com
377fdf27e8 Add a notify reusable workflow 
For now it just contains a slack hook
but in the future, it could contain
other channels.

Contributes to CURA-9365
 2022-06-16 07:04:47 +02:00
j.spijker@ultimaker.com
81b3cc44ce Also build latest on CURA-8160 
Contributes to CURA-9365
 2022-06-16 06:39:03 +02:00
j.spijker@ultimaker.com
215f487978 Workaround for no remote atm 
Our Free tier server has reached it's limit.
This should ensure that we don't use or
ultimaker server. Once the new infrastructure
is in place we should revert this

Contributes to CURA-9365
 2022-06-16 06:36:50 +02:00
Jelle Spijker
09a52d93d6 Revert "Allow for a bool to only build from local cache" 
This reverts commit e1fcca3d9c.
 2022-06-16 06:23:05 +02:00
Jelle Spijker
5b143234b5 Revert "Allow for a bool to only build from local cache" 
This reverts commit ce790c9da9.
 2022-06-16 06:23:05 +02:00
j.spijker@ultimaker.com
ce790c9da9 Allow for a bool to only build from local cache 
This is a workaround to allow further development of this Action
until we have the JFrog server up and running.

Contributes to CURA-9365
 2022-06-16 06:18:47 +02:00
j.spijker@ultimaker.com
e1fcca3d9c Allow for a bool to only build from local cache 
This is a workaround to allow further development of this Action
until we have the JFrog server up and running.

Contributes to CURA-9365
 2022-06-16 06:14:05 +02:00
j.spijker@ultimaker.com
d64e20c71d No need to check hash on build tool 
Contributes to CURA-9365
 2022-06-15 19:58:34 +02:00
j.spijker@ultimaker.com
e717c6572c Fixed wrong word seperator 
Contributes to CURA-9365
 2022-06-15 19:55:55 +02:00
j.spijker@ultimaker.com
ae7df9fbaa Add reusable workflow for conan create 
This workflow should be reused on all our repo's

Contributes to CURA-9365
 2022-06-15 19:23:28 +02:00
j.spijker@ultimaker.com
9a19da97ce Use inputs namespace for input 
Contributes to CURA-9365
 2022-06-15 19:22:13 +02:00
j.spijker@ultimaker.com
22b3290748 recipe-export doesn't have any output 
Contributes to CURA-9365
 2022-06-15 19:18:20 +02:00