THeijmans
151c8919cd
Upload CC06 PLA profiles for TPM
...
These are experimental for Ultimaker materials.
2019-02-08 10:42:43 +01:00
Ghostkeeper
0b85c3a1e9
Remove wireframe from expert settings
...
Nobody really uses it seriously as far as we know.
Contributes to issue CURA-6194.
2019-02-08 10:41:20 +01:00
Jaime van Kessel
43b81c70db
Ensure that color for support extruder selector gets updated in all cases
...
CURA-6144
2019-02-08 10:32:54 +01:00
Ian Paschal
b77c41c5e6
Merge pull request #5279 from Ultimaker/CL-1237_fix_move_to_top
...
Cl 1237 fix move to top
2019-02-08 09:54:45 +01:00
Ghostkeeper
672271d525
Fix running automated tests on Python 3.6
...
This prevents the PyCapsule_GetPointer error.
2019-02-08 09:50:20 +01:00
Ian Paschal
5f0d9fc16a
Merge remote-tracking branch 'origin/4.0' into CL-1237_fix_move_to_top
2019-02-08 09:41:41 +01:00
Ian Paschal
729f4c9d52
Revert "Fix line length"
...
This reverts commit 19f1a2f2d047f646c227e3fbb0d74f2cb7d57abd.
2019-02-08 09:40:56 +01:00
Ghostkeeper
506ce2e6e5
Merge branch 'CURA-5916-show-printing-guidelines-for-custom-material-section'
...
Contributes to issue CURA-5916.
2019-02-08 09:32:56 +01:00
Ian Paschal
19f1a2f2d0
Fix line length
...
Contributes to CL-1237
2019-02-08 09:23:38 +01:00
Diego Prado Gesto
b0cf5f25c6
Merge branch '4.0'
2019-02-07 17:36:44 +01:00
Jaime van Kessel
5c94a8223d
Added button that is shown when instruction_link is set in the profile
...
CURA-5916
2019-02-07 16:08:50 +01:00
Jaime van Kessel
eb6f65d4ec
Add print-guideline icon
...
CURA-5916
2019-02-07 15:19:46 +01:00
Jaime van Kessel
e869829f10
Updated the icon so it also works in the dark theme
2019-02-07 15:17:07 +01:00
Lipu Fei
40ca03fb5d
Merge pull request #5040 from Ultimaker/CURA-5864_prime_tower_brim_enable
...
Cura 5864 prime tower brim enable
2019-02-07 15:09:58 +01:00
Lipu Fei
d6abad3f27
Merge remote-tracking branch 'origin/master' into CURA-5864_prime_tower_brim_enable
2019-02-07 14:47:11 +01:00
Lipu Fei
e5071eac5b
Fix typing
2019-02-07 14:31:40 +01:00
Lipu Fei
47d531e2c5
Fix typing
2019-02-07 14:30:10 +01:00
Lipu Fei
6e40e4a831
Remove unused things
2019-02-07 14:29:59 +01:00
Jaime van Kessel
c15089cd59
Some minor cleanup of the QML
...
CURA-5916
2019-02-07 14:13:00 +01:00
Ian Paschal
2b6bab9552
Re-enable firmware check
...
Contributes to CL-1222
2019-02-06 16:42:26 +01:00
Remco Burema
da6ff7c5a9
Merge branch 'master' into temp_CURA-5864
2019-02-06 16:23:30 +01:00
Remco Burema
3a94745667
Make sliders reappear in simulation-view. [CURA-6183]
2019-02-06 16:01:01 +01:00
Aleksei Kvitinskii
dad8acb106
update position var type
2019-02-06 17:29:43 +03:00
Ian Paschal
fcb52dd1cf
Show cloud flow pop-up if machine is removed from cloud
...
Contributes to CL-1222
2019-02-06 14:26:11 +01:00
Ian Paschal
162fdad4e4
Improve conditions for starting cloud flow
...
Contributes to CL-1222
2019-02-06 13:58:33 +01:00
Jaime van Kessel
575f323ea1
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-02-06 13:07:09 +01:00
Jaime van Kessel
8d7b623879
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-02-06 12:37:50 +01:00
Jaime van Kessel
c7c57c167c
Fix call to non-existing function
2019-02-06 12:37:30 +01:00
Simon Edwards
8e569126ff
Use the older but backwards compatible API for moving print jobs in the queue.
...
CL-1237
2019-02-06 12:19:59 +01:00
Simon Edwards
18786a1e7d
Fix the default content-type for HTTP PUT requests in NetworkedPrinterOutputDevice
...
CL-1237
2019-02-06 12:18:32 +01:00
Ian Paschal
3a4fcb354a
Show cloud connection flow pop-up
...
Contributes to CL-1222
2019-02-06 12:04:15 +01:00
Ian Paschal
ae7936a823
Update theme.json
...
Contributes to CL-1222
2019-02-06 12:01:52 +01:00
Ian Paschal
b1104124f3
Add address property to ClusterUM3OutputDevice
...
This was necessary because it was the only way to get the address (NetworkPrinterDevice and PrinterOutputDevice returned empty strings)
Contributes to CL-1222
2019-02-06 12:01:42 +01:00
Ian Paschal
01ca3546aa
Add activeMachineAddress to MachineManager for easy access
...
Contributes to CL-1222
2019-02-06 11:59:39 +01:00
Ian Paschal
348689eace
Add cloud flow graphics
...
Contributes to CL-1222
2019-02-06 11:58:51 +01:00
Ian Paschal
58d998af68
Add theme entry for message image
...
Contributes to CL-1222
2019-02-06 11:58:22 +01:00
Remco Burema
0a860c7011
Dissalow overlap of skirt/brim (model vs. prime-towrer) in case of prime-tower brim. [CURA-5864]
2019-02-05 18:15:23 +01:00
Aleksei Kvitinskii
c270b94ec1
added Z-Bolt printers
2019-02-05 19:57:19 +03:00
Ian Paschal
5c0c176730
Show confirmation pop-up for cloud flow
...
Contributes to CL-1222
2019-02-05 16:52:15 +01:00
Ian Paschal
70c384bd4e
Finish adding cloud flow checks
...
Contributes to CL-1222
2019-02-05 16:51:47 +01:00
Ian Paschal
b29f3d3bd0
Improve comment
...
Contributes to CL-1222
2019-02-05 16:50:50 +01:00
Ian Paschal
c41e81a6b9
Set required firmware version for cloud to 5.2.0
...
Contributes to CL-1222
2019-02-05 16:50:36 +01:00
Ian Paschal
d022672bcf
Add signal to CloudOutputDeviceManager for added cloud device
...
Contributes to CL-1222
2019-02-05 16:49:54 +01:00
Jaime van Kessel
f2fbb4e989
Merge branch 'CURA-6174_fix_time_estimates_dark_theme' of github.com:Ultimaker/Cura into 4.0
2019-02-05 13:38:44 +01:00
Jaime van Kessel
91f90e7d40
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-02-05 13:32:14 +01:00
Jaime van Kessel
b6f5dd8f94
Fix display of long names in sync configuration menu
2019-02-05 13:31:50 +01:00
Remco Burema
5c54cb740a
Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174]
2019-02-05 13:24:28 +01:00
Lipu Fei
4ea6e5d0df
Merge remote-tracking branch 'origin/4.0'
2019-02-05 11:40:50 +01:00
Remco Burema
8f5a34c592
Merge pull request #5181 from drzejkopf/patch-4
...
Let "retraction_combing" be overriden with "infill" as default value
2019-02-05 11:25:17 +01:00
Lipu Fei
cfdadbaffb
Merge pull request #5270 from Ultimaker/action_panel_per_stage
...
Let each stage create its own action panel
2019-02-05 11:16:00 +01:00
