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
b18565d9cf
Merge branch 'master' into feature_intent_container_tree
2019-09-10 11:08:21 +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
Jaime van Kessel
0235ad6930
Check gltf extension against lower() filename
...
CURA-6739
2019-09-06 09:51:26 +02:00
ChrisTerBeke
5f480f753c
Add fixme note to hardcoded extruder count
2019-09-06 09:50:15 +02:00
ChrisTerBeke
549b724a4f
Use 2 extruders at all times for now
2019-09-06 09:37:43 +02:00
ChrisTerBeke
ab3f627177
Check if printerConfiguration is actually set before trying to access it
2019-09-05 18:01:04 +02:00
Ghostkeeper
71b94f6d5b
Create own quality changes profiles instead of asking quality manager
...
It was a protected function call on a different class anyway, so that should never have gotten accepted.
Contributes to issue CURA-6600.
2019-09-05 17:26:48 +02:00
Jaime van Kessel
9d5ee286b4
Merge branch 'CURA-6537_ui_feedback_on_invalid_firmware' of github.com:Ultimaker/Cura
2019-09-05 16:10:30 +02:00
Chris ter Beke
e02f0f1480
Merge pull request #6302 from Ultimaker/fix-job-sending
...
Print job uploading
2019-09-05 14:43:56 +02:00
Lipu Fei
46a15762aa
Add doc for the need of filename in processGCodeStream()
2019-09-05 14:19:48 +02:00
Lipu Fei
5644721073
Fix UFPReader due to gcode reader readFromStream() change
2019-09-05 14:17:49 +02:00
ChrisTerBeke
210843a7bb
Improve adding/connecting to output devices
2019-09-05 10:47:15 +02:00
ChrisTerBeke
4364d94423
Reduce logging and network activity during print job upload
2019-09-04 18:54:53 +02:00
Diego Prado Gesto
79aefa950f
Merge pull request #6298 from bkp23/master
...
Fixed PauseAtHeight.py to resume at starting height
2019-09-04 15:54:15 +02:00
Lipu Fei
b67944cac1
Fix workaround for GLTF loading
...
CURA-6739
2019-09-04 15:25:58 +02:00
Remco Burema
16ea437255
Make 3MF-reader aware of setting-version for introduction Intent.
2019-09-04 14:52:54 +02:00
Lipu Fei
cadbde7b92
Add workaround for GLTF loading
...
CURA-6739
2019-09-04 14:33:24 +02:00
Diego Prado Gesto
f051c48b9e
Add a printer to the list of translation IDs
...
Contributes to CURA-6742.
2019-09-04 14:11:57 +02:00
B. Perry
6ed57838a9
Fixed PauseAtHeight.py to resume at starting height
2019-09-03 14:02:52 -06:00
ChrisTerBeke
abb1d5d5eb
Merge branch 'master' into CS-278_ignore_material_empty
...
* master:
Do not trigger slicing if there's no slicable object
Fix regex in FlavorParser
2019-09-03 21:30:34 +02:00
ChrisTerBeke
ed616789cb
Remove debug print statement
2019-09-03 21:22:13 +02:00
ChrisTerBeke
86d87acd5b
Filter out configurations for empty materials
2019-09-03 21:21:06 +02:00
Lipu Fei
0524796145
Do not trigger slicing if there's no slicable object
...
CURA-6604
2019-09-03 20:01:41 +02:00
