Jaime van Kessel
5e4f673ec2
Merge branch '4.3' of github.com:Ultimaker/Cura
2019-09-11 16:10:12 +02:00
Ghostkeeper
f6089ed627
Don't use material manager to get list of materials to send
...
The material manager is no longer populated so it wouldn't send any materials any more.
This is probably faster anyway since it doesn't need to go back to the container registry for every file.
Contributes to issue CURA-6600.
2019-09-11 15:43:35 +02:00
Ian Paschal
72ba6153c2
Boyscout some stuff
...
CS-158
2019-09-11 14:50:54 +02:00
Ian Paschal
3b5cf115f1
Reduce progress bar length
...
CS-158
2019-09-11 14:50:42 +02:00
Ian Paschal
07a5213ea6
Reduce text size to 12pt from 14pt
...
CS-158
2019-09-11 14:50:15 +02:00
Jaime van Kessel
d6d06fb85b
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade
2019-09-10 15:07:57 +02:00
Ghostkeeper
ef8b9e98d1
Remove calls to quality manager's private functions
...
It should never have been called that way.
Contributes to issue CURA-6600.
2019-09-10 14:47:36 +02:00
Diego Prado Gesto
190984462b
Merge branch '4.3'
2019-09-10 14:17:31 +02:00
Lipu Fei
cfeefe365d
Merge pull request #6328 from Ultimaker/fix_select_face
...
CURA-6754 / CURA-6761 Fix Select Face
2019-09-10 14:05:41 +02:00
Ghostkeeper
9b05624b8d
Merge branch '4.3'
2019-09-10 14:04:09 +02:00
Nino van Hooff
42a3e1227a
Use explicit types for mesh_type qml properties
...
CURA-6683
2019-09-10 13:37:05 +02:00
Nino van Hooff
0ba1bfbe4f
Enable Per Object Settings when extruder is in Recommended mode
2019-09-10 13:37:05 +02:00
Nino van Hooff
6101afa68b
Remove redundant namespace usages
2019-09-10 13:37:05 +02:00
Nino van Hooff
812eeab07a
Show infill checkbox only for overhang mesh types
2019-09-10 13:37:05 +02:00
Nino van Hooff
760234f69b
Per Object Settings qml for icon buttons
2019-09-10 13:37:05 +02:00
Nino van Hooff
a457265c07
Update the Support Eraser icon size
2019-09-10 13:37:05 +02:00
Nino van Hooff
789ebc4df8
Update the Support Eraser (support blocker) icon
2019-09-10 13:37:05 +02:00
Nino van Hooff
87c81055e3
Update the per-object-settings icon
2019-09-10 13:37:05 +02:00
Remco Burema
e5a690e605
Wrap up 'lay flat by face' feature for 4.3-BETA.
...
Icon thanks to Yi-An Lai.
part of CURA-6754
2019-09-10 12:37:59 +02:00
Lipu Fei
87285f6b86
Fix version upgrade 42 to 43
2019-09-10 12:22:16 +02:00
Jaime van Kessel
7d8911b74d
Fix version upgrade for stacks
...
CURA-6599
2019-09-10 11:41:42 +02:00
Diego Prado Gesto
b18565d9cf
Merge branch 'master' into feature_intent_container_tree
2019-09-10 11:08:21 +02:00
Jaime van Kessel
e9862fb348
Move version upgrade for intents from 4.1-4.2 to 4.3-4.4
...
CURA-6599
2019-09-10 10:57:25 +02:00
Ghostkeeper
f561218346
Merge branch '4.3'
2019-09-09 17:37:12 +02:00
Ghostkeeper
5debdd4cf6
Fix getting extruder list everywhere
...
Didn't test this beyond my own automated test, it seems.
Contributes to issue CURA-6600.
2019-09-09 16:47:29 +02:00
Jaime van Kessel
8c893caf9f
Merge pull request #6315 from Ultimaker/CURA-6755_add_retract_continue_script
...
Add retract-continue script
2019-09-09 13:05:33 +02:00
ChrisTerBeke
669fb39f40
Catch type errors when trying to populate models from API response
2019-09-09 10:44:17 +02:00
Jaime van Kessel
5463f7600b
Add processEvent calls so progress bar moves while loading
...
CURA-6572
2019-09-09 09:08:52 +02:00
Jaime van Kessel
7d3a2c60d4
Added some missing typing
2019-09-06 17:38:22 +02:00
Jaime van Kessel
5e41443bef
Merge branch 'master' of github.com:Ultimaker/Cura
2019-09-06 17:26:42 +02:00
Jaime van Kessel
6f92537305
Add unhappy test for serializing nonbase material
2019-09-06 17:26:28 +02:00
Jaime van Kessel
09025edffa
Convert some class functions to static
...
Since they didn't access any class attributes, there is no need for them to be classMethods
2019-09-06 17:22:40 +02:00
Ghostkeeper
8bcd9b339a
Use GlobalStack.extrudersList instead of GlobalStack.extruders to iterate
...
Otherwise the iteration can happen in any arbitrary order (due to the dict) and this can cause the result to not match to the desired combination of configurations per extruder.
Contributes to issue CURA-6600.
2019-09-06 17:20:03 +02:00
Jaime van Kessel
94b6f7864f
Add some tests for XMLMaterialProfile
2019-09-06 17:19:23 +02:00
Ghostkeeper
47fab6e16f
Merge branch '4.3'
2019-09-06 16:04:26 +02:00
Ian Paschal
f517beba76
Fix typo
...
CS-171
2019-09-06 16:04:03 +02:00
Ian Paschal
e0194d8721
Extend found_machine_type_identifiers to include R2
...
CS-171
2019-09-06 16:03:48 +02:00
Ghostkeeper
b24ea11cfc
Merge branch '4.3'
2019-09-06 16:02:21 +02:00
Ghostkeeper
82aa0492ea
Revert "CS-171 Add R2 support"
2019-09-06 14:00:04 +00:00
Jaime van Kessel
608ca3e92a
Convert some functions to static
2019-09-06 15:18:50 +02:00
Ghostkeeper
f5aa2921ff
Add space before comments
...
Some pause commands on some printers (looking at you, Repetier) seem to require a space after it, which is not obvious to the user. So we'll put a space there for them.
Fixes #6295 .
2019-09-06 14:35:29 +02:00
Diego Prado Gesto
4e086054a5
Merge branch '4.3'
2019-09-06 12:57:47 +02:00
Ghostkeeper
b20e5bfd98
Don't display any message if setting is empty
...
Contributes to issue CURA-6759.
2019-09-06 12:42:15 +02:00
Ghostkeeper
c1b4bcebec
Add message while pausing
...
This way you can display instructions during the print.
Implements issue CURA-6759.
2019-09-06 12:41:09 +02:00
Chris ter Beke
7ff7ab53bf
Merge pull request #6313 from Ultimaker/CS-171_add_r2_support
...
CS-171 Add R2 support
2019-09-06 11:53:55 +02:00
Ghostkeeper
138d76e7d9
Rename speed to ratio
...
Contributes to issue CURA-6755.
2019-09-06 11:46:59 +02:00
Ghostkeeper
2abda86162
Add retract-continue script
...
Contributes to issue CURA-6755.
2019-09-06 11:38:53 +02:00
Ian Paschal
f49cf8dfd5
Fix typo
...
CS-171
2019-09-06 11:30:42 +02:00
Ian Paschal
7674905f1c
Extend found_machine_type_identifiers to include R2
...
CS-171
2019-09-06 11:23:28 +02:00
Simon Edwards
f53031f6b9
Merge pull request #6311 from Ultimaker/CS-284_fix_crash_missing_printer_configuration
...
Check if printerConfiguration is actually set before trying to access it
2019-09-06 10:30:25 +02:00
