Diego Prado Gesto
0085660153
Use non-abbreviated names in the configurations list
2019-09-16 15:59:21 +02:00
Nino van Hooff
5efc0e7f27
Mypy: do not stop after finding issues in a module
2019-09-16 15:41:04 +02:00
Ghostkeeper
5617784b48
Implement version upgrade for UM2 with Olsson
...
Contributes to issue CURA-6775.
2019-09-16 15:38:01 +02:00
Diego Prado Gesto
021a04c427
Show the printer types list when we show the label every time or when only show the label for the active printer.
2019-09-16 15:29:34 +02:00
Ghostkeeper
8d21f75c40
Merge branch 'feature_intent_container_tree' into feature_intent_upgrade
2019-09-16 15:20:41 +02:00
Ghostkeeper
9b341cf604
Remove UM2 upgrade selection machine action
...
Instead of choosing the Olsson block with this wizard, choose it by choosing the correct definition to start with.
Contributes to issue CURA-6775.
2019-09-16 15:19:47 +02:00
Ghostkeeper
bda7a6ce0a
Shorten name of UM2E with Olsson
...
This is necessary because on some file systems (e.g. encryptfs) the length of these file names is limited and that would crash Cura.
Contributes to issue CURA-6775.
2019-09-16 15:15:17 +02:00
Ghostkeeper
3b5716a64a
Add definition for Ultimaker 2 Extended with Olsson Block
...
Only the name is now too long by default. I have to shorten it.
Contributes to issue CURA-6775.
2019-09-16 15:07:04 +02:00
Ellecross
28310e03f2
Revert "Only show printerTypes for active machine"
...
This reverts commit 2395567f1eb505a814f3b305e5a59138dfe8c144.
2019-09-16 15:05:09 +02:00
Nino van Hooff
dbb9e55bc8
Fix MyPy warning in PerObjectSettingsTool
...
CURA-6683
2019-09-16 15:05:02 +02:00
Ghostkeeper
c6a57a0ab7
Give Ultimaker 2 with Olsson the quality definition of the Ultimaker 2
...
This way, the user's profiles should remain intact after the upgrade.
Contributes to issue CURA-6775.
2019-09-16 15:00:05 +02:00
Ghostkeeper
3c9d191a6e
Add separate definition for Ultimaker 2 with Olsson block
...
This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer.
However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible.
By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well.
Contributes to issue CURA-6775.
2019-09-16 14:57:45 +02:00
Jaime van Kessel
6ff59bf5ab
Fix some more issues with the custom FF printer
2019-09-16 11:48:10 +02:00
Jaime van Kessel
e964035653
Fix adding custom FFF printer
2019-09-16 11:40:32 +02:00
Jaime van Kessel
c0db1a17be
Fix the false positive failure in the unit test
2019-09-16 11:40:08 +02:00
Lipu Fei
e1a52f841f
Correct typing
2019-09-16 10:48:39 +02:00
Jaime van Kessel
0f8dfeafc1
fix typo
2019-09-16 09:26:12 +02:00
Lipu Fei
4dea8fba76
Merge pull request #6349 from Ultimaker/CURA-6775_fix_crash_empty_containers
...
Fix crash when adding printers with empty profile layers
2019-09-16 09:15:10 +02:00
Daniel Green
57a50c9c3d
Correction for build volume.
2019-09-15 09:56:21 -07:00
Mark Burton
fb5ec97cb8
Fix spelling.
2019-09-14 20:19:52 +01:00
Jaime van Kessel
0ff9d72c4c
Remove use of deprecated extruders property
2019-09-13 17:27:16 +02:00
Ghostkeeper
2cca95384d
Don't look for quality group for empty material
...
Just don't add it to the list of available intents then.
Contributes to issue CURA-6775.
2019-09-13 16:09:02 +02:00
Ghostkeeper
7942db5147
Give empty material the required material properties
...
It needs a GUID, base file and material type to show up in the material nodes in the container tree.
Contributes to issue CURA-6775.
2019-09-13 16:07:33 +02:00
Ghostkeeper
cc27392ab0
Don't use material groups to update metadata
...
The material groups are not filled any more in the material manager so this fails.
This might make updating metadata of material profiles slightly slower, but when testing this I noticed no difference.
The function becomes a lot simpler though. And it works again.
Contributes to issue CURA-6600.
2019-09-13 14:42:27 +02:00
Ghostkeeper
bb0c9c80dc
Don't use material groups to find just the root container
...
Just look it up in the container registry. If you know the ID, this look-up is just a dictionary look-up as well.
Contributes to issue CURA-6600.
2019-09-13 14:42:27 +02:00
Ghostkeeper
882e60bf95
Fix typing of application
...
Because CuraApplication has the getMachineManager() function and such, not UM.Application.
Discovered during work on CURA-6600.
2019-09-13 14:42:26 +02:00
Nino van Hooff
d6872a65bd
Fix infillOnlyCheckbox not representing mesh type
...
Not a bug but a feature: When the overlays button is clicked, the infill
mesh type is set and the checkbox checked
CURA-6683
2019-09-13 13:36:30 +02:00
Remco Burema
756c21cd19
Remove extra empty lines in ChangeAtZ-scipt output.
2019-09-13 13:33:06 +02:00
Nino van Hooff
44fbcaeb3a
Fix Settings lines positioning for Per Object Settings
...
CURA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
667e5f8e18
Fix reference error in POS
...
CURA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
606faf54c2
Remove unnecessary component initialization
...
CURA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
fe0e1e5aba
Remove unnecessary ; line endings in QML
...
CURA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
90fefac37f
Remove redundant rows from POS QML
...
CuRA-6683
2019-09-13 13:26:00 +02:00
Nino van Hooff
184a72f7ab
Bind current_mesh_type to UM.ActiveTool.properties.getValue("MeshType")
...
CURA-6683
2019-09-13 13:26:00 +02:00
Jaime van Kessel
55a8d03d42
Fix typing error
2019-09-13 13:16:48 +02:00
Remco Burema
ef0f5988a2
Fix 3MF-workspace-reading: Variants where not loaded properly.
...
part of CURA-6600
2019-09-13 12:59:54 +02:00
Ian Paschal
495ed17294
Merge pull request #6347 from Ultimaker/allow_hiding_new_cloud_printers_popup
...
Store in preferences if the user wants to hide the message
2019-09-13 12:54:01 +02:00
maukcc
d514b324fb
HMS434 update
...
HMS434 update on material and quality profiles
2019-09-13 11:38:42 +02:00
ChrisTerBeke
55cdb07c1c
Fix loading popup image on windows
2019-09-13 11:12:13 +02:00
ChrisTerBeke
5dfb8216df
Fix loading popup image on windows
2019-09-13 11:06:34 +02:00
Lipu Fei
5631e94a48
Fix creality variant versions
2019-09-13 10:53:10 +02:00
Lipu Fei
bbde75491d
Fix version number in upgrade from 4.1 to 4.2
2019-09-13 10:52:41 +02:00
Jaime van Kessel
2395567f1e
Only show printerTypes for active machine
2019-09-13 10:49:35 +02:00
ChrisTerBeke
e8b48a299b
Store in preferences if the user wants to hide the message
2019-09-13 10:45:42 +02:00
Jaime van Kessel
1e130637ee
Remove retry action from login
...
It doesn't work anyway and there is another way that does work (eg; login via the top right)
2019-09-13 10:38:52 +02:00
Lipu Fei
fa8213c601
Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade
2019-09-13 10:31:11 +02:00
Jaime van Kessel
febe953226
Don't assert if there are already 7 containers in stack
...
CURA-6599
Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2019-09-13 09:29:49 +02:00
Diego Prado Gesto
bca68c6db0
Merge branch 'feature_intent' into feature_intent_container_tree
2019-09-13 09:02:51 +02:00
Diego Prado Gesto
d38e60ce06
Merge branch 'master' into feature_intent
2019-09-13 09:02:30 +02:00
Diego Prado Gesto
d9af8bd6b0
Merge branch '4.3'
2019-09-13 09:00:34 +02:00
