30086 Commits

Author SHA1 Message Date
Jaime van Kessel
89fbac74f9
Fix incorrectly setting material_print_temperature
If this is set to an absolute value, the material settings wont have any effect anymore.
A much better way is to just set the default temperature, which is what the intent is
2022-09-01 17:51:25 +02:00
Jaime van Kessel
ccdbc3e06f
Merge pull request #13177 from Ultimaker/PP-235-clean-up-adhesion_type
PP-235-clean-up-adhesion_type
2022-09-01 15:01:49 +02:00
Remco Burema
053437a502 UX: The color needs to be the same. 2022-09-01 14:15:16 +02:00
Jaime van Kessel
6563ba32b4
Fix crash with removedPrinterMessage 2022-09-01 14:12:02 +02:00
Remco Burema
f6190f9b23
Merge pull request #9255 from Ultimaker/tree_support_max_radius
setting for support_tree_max_diameter
2022-09-01 12:56:29 +02:00
jelle Spijker
3f02a96b33 don't use no_commits 2022-09-01 12:15:21 +02:00
jellespijker
e59aa8e22b temporary fix for external PR 2022-09-01 12:13:31 +02:00
j.spijker@ultimaker.com
03c6686f7d Only run create package on our pr 2022-09-01 12:02:33 +02:00
jellespijker
76466b776a Use different checkout scheme based on forked repo 2022-09-01 12:00:07 +02:00
j.spijker@ultimaker.com
df0179ef58 define it as inputs 2022-09-01 10:26:02 +02:00
jellespijker
046985270a Add optional input is_external_pr 2022-09-01 09:51:46 +02:00
jellespijker
2385b00af3 Fixes external PR version
Differentiate between internal actions and those of PR's

This should fix the failing unit tests on forked PR
2022-09-01 09:33:23 +02:00
Casper Lamboo
fa78996bab
Merge pull request #13179 from Ultimaker/CURA-9289_Automatically_add_abstract_machines
Always check if an abstract machine needs to be added
2022-09-01 09:00:15 +02:00
Jaime van Kessel
3040a7c830
Always check if an abstract machine needs to be added
CURA-9289
2022-08-31 18:11:24 +02:00
Jaime van Kessel
438871648b
Don't notify qml of update if no configurations changed
This might be the cause of #11608, but i'm not entirely sure. Whatever
the case, it's also not going to hurt checking this...
2022-08-31 16:31:39 +02:00
Casper Lamboo
62b102cc74
Merge pull request #13175 from Ultimaker/CURA-9422_abstract_cloud_monitor_redux
[CURA-9422] abstract cloud monitor redux
2022-08-31 16:09:40 +02:00
c.lamboo
c73b980a3d Merge branch 'main' into CURA-9422_abstract_cloud_monitor_redux
# Conflicts:
#	resources/qml/PrinterSelector/MachineListButton.qml
2022-08-31 16:05:00 +02:00
c.lamboo
60a670f2ed Update light-mode cura_connected_printers svg
Old one was not displaying on my machine

CURA-9422
2022-08-31 15:56:02 +02:00
Rijk van Manen
b3fb34d84a clean up adhesion_type
S-line printers can follow the machine default. PP-brim will be moved to fdm materials. PP-235
2022-08-31 15:54:20 +02:00
Jaime van Kessel
ded3873249
Fix abstract machines being displayed twice 2022-08-31 15:12:25 +02:00
Remco Burema
a713b1e9e9
Merge pull request #13165 from Ultimaker/CURA-8463_cloud_configuration
Show all configurations in "abstract" printer from cloud
2022-08-31 14:50:13 +02:00
Remco Burema
afeec473f6 Small fixes (mostly QML warnings and the like).
done as part of CURA-9422
2022-08-31 14:15:05 +02:00
Remco Burema
4ea437ba28 Make send to DF in monitor for abstract printer work (again-ish).
Already moslty implemented, but a new approach of the base feature (abstract cloud printers) made a more? elegant and functioning implementation possible.

(re)implements CURA-9422
2022-08-31 14:13:47 +02:00
Jaime van Kessel
5daf45e750
Merge pull request #13172 from digitalfrost/310822
MachineAction.py: Use error method with Logger
2022-08-31 14:11:31 +02:00
joeydelarago
ab722eb93c Default printers should be collapsed
CURA-9514
2022-08-31 13:19:12 +02:00
digitalfrost
9084c31ce7 MachineAction.py: Use error method with Logger
Use f-string and error method with Logger instead of "Old Style" string
formatting.
2022-08-31 12:11:20 +02:00
Casper Lamboo
0ccca3fde5
Merge pull request #13168 from Ultimaker/CURA-9514
Add button to hide/show connected printers
2022-08-31 11:17:37 +02:00
Casper Lamboo
dccffdeca3
Update cura/Machines/Models/MachineListModel.py 2022-08-31 11:08:37 +02:00
joeydelarago
19835844bf Change listType -> componentType. Makes it a bit more clear that this variable decides which component should be used for the model.
CURA-9514
2022-08-31 10:50:20 +02:00
joeydelarago
f94bbb9ebc Merge branch 'main' into CURA-9514 2022-08-31 10:44:30 +02:00
Jaime van Kessel
aa34ee84ec
Merge pull request #13103 from Ultimaker/PP-216_Move_top_surface_settings_out_of_experimental
Moved top layer (roofing) settings out of experimental: “Top surface …
2022-08-31 10:41:18 +02:00
Jaime van Kessel
4c55befad7
Merge branch 'main' of github.com:Ultimaker/Cura into CURA-8463_cloud_configuration 2022-08-31 10:39:05 +02:00
Rijk van Manen
c3dd70f7c7 fix incorrect spacing 2022-08-31 10:37:41 +02:00
Jaime van Kessel
b9e8bca012
Remove commented out properties
CURA-8463
2022-08-31 10:33:46 +02:00
Jaime van Kessel
5ff07b00d0
Fix case where both a "normal" and an "abstract" ouput device could be active
CURA-8463
2022-08-31 10:27:52 +02:00
joeydelarago
b999a88b26 Update function name to match code style
CURA-9514
2022-08-31 10:26:57 +02:00
joeydelarago
2ff0aed171 Remove height binding loop.
CURA-9514
2022-08-31 10:26:23 +02:00
joeydelarago
9f204f2e43 Update isAbstractMachine to match Role name format.
CURA-9514
2022-08-31 10:20:50 +02:00
joeydelarago
760e53c401 Fix indentation
Remove debug statement

CURA-9514
2022-08-31 10:19:02 +02:00
Jaime van Kessel
dd5981d85e
Only remove abstract output device if it's actually added
CURA-8463
2022-08-31 10:09:47 +02:00
joeydelarago
daab1aae71 QML was attempting to fetch variables that were emtpy. Using self.clear() properly removed unused items when the list is resized to be smaller.
Also add some dummy variables inside cloud printer expand and contract buttons.

CURA-9514
2022-08-31 10:05:41 +02:00
Jaime van Kessel
d20a83d9aa
Merge pull request #13163 from Ultimaker/PP-172-dont-avoid-supports
disable travel_avoid_supports
2022-08-31 09:46:09 +02:00
c.lamboo
aa1c09591f Typo
CURA-9514
2022-08-31 08:15:13 +02:00
c.lamboo
60b12b9247 Use list model to display show hide buttons
CURA-9514
2022-08-31 07:58:05 +02:00
c.lamboo
ac732e9604 Add button to hide/show connected printers
CURA-9514
2022-08-30 23:15:54 +02:00
Remco Burema
401170d8dd
Merge pull request #11744 from Ultimaker/sprialize_removes_holes
automatically remove all holes when spiralizing
2022-08-30 17:15:18 +02:00
Remco Burema
e69b855b2b
Merge pull request #13127 from Ultimaker/CURA-9221_show_message_cloud_approval
[CURA-9221] Show message cloud approval
2022-08-30 16:53:47 +02:00
Remco Burema
7ab16e078c Speared spurious space.
done as part of CURA-9221
2022-08-30 16:45:34 +02:00
Jaime van Kessel
feadbf04da
Fix status request for Ultimaker 2+ Connect
CURA-8463
2022-08-30 16:42:15 +02:00
Jaime van Kessel
e2ba110cf7
Ensure that all material configs are added to the list
CURA-8463
2022-08-30 16:33:29 +02:00