Commit graph

29423 commits

Author SHA1 Message Date
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
Stefano Serioli
25a7c3e263
Merge branch 'Ultimaker:main' into main 2022-06-15 18:31:23 +02:00
StuSerious
a83daee8da update CITATION to latest version (.cff and Cura)
this brings citation file format to 1.2 and Cura version to 5.0.0.

some other changes and important fields were also added.
2022-06-15 18:30:11 +02:00
Casper Lamboo
dd76369b9a
Merge pull request #12528 from Ultimaker/CURA-8849
[CURA-8849] Improve intent profile selection
2022-06-15 18:24:18 +02:00
j.spijker@ultimaker.com
dcb376fd43 Add a reusable workflow to export the conan recipe
This workflow will be used by all our repo's

Contributes to CURA-9365
2022-06-15 18:07:31 +02:00
j.spijker@ultimaker.com
d3c151d415 Add a reusable worrflow to determine the Version and id
This workflow will be used by all our repo's

Contributes to CURA-9365
2022-06-15 18:06:49 +02:00
Jelle Spijker
80a2c12bc1 Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-15 18:05:34 +02:00
j.delarago
f9dda40409 Better typing
CURA-8849
2022-06-15 17:41:21 +02:00
j.delarago
6f8470167f Suggested changes
CURA-8849
2022-06-15 17:40:07 +02:00
Joey de l'Arago
142f1823b3
Apply suggestions from code review
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:31:40 +02:00
Joey de l'Arago
b132b5c08c
Update cura/Machines/Models/IntentSelectionModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:29:59 +02:00
Joey de l'Arago
e47a2d1c99
Update cura/Machines/Models/IntentSelectionModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:29:26 +02:00
Joey de l'Arago
b4152d29d6
Update cura/Machines/Models/ActiveIntentQualitiesModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:29:16 +02:00
Joey de l'Arago
87afb117d0
Update cura/Machines/Models/ActiveIntentQualitiesModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:28:22 +02:00
Joey de l'Arago
760976159c
Update cura/Machines/Models/ActiveIntentQualitiesModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:28:13 +02:00
Joey de l'Arago
caa0c255aa
Update cura/Machines/Models/ActiveIntentQualitiesModel.py
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2022-06-15 17:28:06 +02:00
j.delarago
cd34294914 Revert "disable travel_avoid_supports"
This reverts commit 8f2dff712e.
2022-06-15 17:19:03 +02:00
Jaime van Kessel
1a0b095f8d
Merge pull request #11721 from Haxk20/patch-1
voron2_base.def.json: Do not limit travel speeds to 300mm/s
2022-06-15 16:08:09 +02:00
j.delarago
8c2ac9f21e Remove excessive logs, make path search recursive for materials.
CURA-8610
2022-06-15 15:47:17 +02:00
Remco Burema
188b63703b
Merge pull request #12531 from Ultimaker/CURA-8555_link_ufp_to_3mf_in_digital_library
Cura 8555 link ufp to 3mf in digital library
2022-06-15 15:16:11 +02:00
Rijk van Manen
d4095e7e1d set correct nozzle tip outer diameter
This is the size of the ruby. PP-116
2022-06-15 15:12:34 +02:00
Rijk van Manen
311b5e94ce add machine nozzle tip size
PP-116
2022-06-15 14:58:34 +02:00
Rijk van Manen
5db8567bff cleanup variant profile
In the ppCCB we decided to clean up to DD variant profiles, since we plan to do that with all variant profiles in the future. PP-116
2022-06-15 14:58:16 +02:00
Ghostkeeper
bb058d18cb
Merge branch 'main' of github.com:Ultimaker/Cura 2022-06-15 14:40:42 +02:00
Ghostkeeper
20607b219a
Merge branch 'split-removable-output-write-function' of https://github.com/zxc8027/Cura into zxc8027-split-removable-output-write-function 2022-06-15 14:37:39 +02:00
Remco Burema
a82b90fd96
Merge pull request #12488 from Ultimaker/PP-108_Improved_support_settings
PP-108 improved support settings
2022-06-15 14:24:09 +02:00
Jelle Spijker
73b4e47e2b Merge branch 'main' into CURA-9365_fix_building_cura_main 2022-06-15 14:17:37 +02:00
j.delarago
4e80d170d1 Add logs for debugging
CURA-8610
2022-06-15 14:09:05 +02:00