Diego Prado Gesto
56171776f6
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-10-25 13:57:04 +02:00
Diego Prado Gesto
87ba4056ee
CURA-4485 Minor changes
2017-10-25 13:55:30 +02:00
ChrisTerBeke
9b62b48509
WIP - CURA-4451
2017-10-25 13:27:35 +02:00
Ghostkeeper
73e809b956
Remove specialised start g-code from Creality CR-10
...
By request from Michael.
This makes it the same as the start g-code for the Custom FDM Printer, which apparently works better.
2017-10-25 13:20:05 +02:00
fieldOfView
ff847aa329
Fix qml error when there is no connected printer
...
Also fixes code style
2017-10-25 11:52:43 +02:00
Ghostkeeper
9ad0fd2b83
Remove dash if plug-in author is empty
...
Contributes to issue CURA-4477.
2017-10-25 11:28:41 +02:00
Aleksei S
d2873dc65a
The view class were not added after to the rendering list after changing them
...
CURA-4062
2017-10-25 11:06:12 +02:00
daid
e824996af7
Fix the OpenGL shader for older (legacy?) OpenGL. As the grid shader was no longer working.
2017-10-25 10:19:28 +02:00
ChrisTerBeke
7bf854aa0f
Remove some changes, debugging - CURA-4451
2017-10-25 09:52:14 +02:00
Aleksei S
0f807cd03e
Wfter changing the view the old view is removed from rendering
...
CURA-4062
2017-10-24 17:38:06 +02:00
Diego Prado Gesto
7404df66ac
CURA-4481 Disable "Remove empty layers" when support is enabled.
...
When support is enabled then it doesn't matter if the user choose
whether to remove or not the empty layers, because it's done after
generating supports. In order to avoid confusion to the user, the
setting is disabled.
2017-10-24 16:46:45 +02:00
Diego Prado Gesto
ba3f1362e6
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-10-24 15:59:17 +02:00
Diego Prado Gesto
0eedfa5c18
CURA-4485 Disabling automatic material and variant when connecting to a
...
printer within a cluster of more than 1 printer.
2017-10-24 15:45:20 +02:00
Jack Ha
a66d27e30e
CURA-4176 reintroduced Wall Extruder. Added limit_to_extruder trick in wall_line_width as suggested in issue to evade inheritance problems.
2017-10-24 15:01:57 +02:00
Diego Prado Gesto
6dfd04928f
CURA-4485 Activate configuration option disabled in printers within a
...
cluster.
Just allow when there is a cluster with just one printer.
2017-10-24 14:51:35 +02:00
ChrisTerBeke
c679f4aa6b
Merge branch 'master' into CURA-4451_not_support_container
2017-10-24 13:41:14 +02:00
ChrisTerBeke
c1139c5c45
Update stack error checking when switching matchines - CURA-4447
2017-10-24 13:38:14 +02:00
fieldOfView
15abbe6d6b
Optimise icon
2017-10-24 12:50:53 +02:00
ChrisTerBeke
9083fe1bf0
Add not supported instance container type and qt role - CURA-4451
2017-10-24 11:53:56 +02:00
fieldOfView
7dc4975b36
Tweak layout and texts
2017-10-24 11:33:47 +02:00
Jack Ha
5d51d547da
Merge branch 'master' of github.com:Ultimaker/Cura
2017-10-24 11:25:21 +02:00
Jack Ha
d8e1b5b9b4
CURA-4481 add setting Remove Empty First Layers
2017-10-24 11:25:12 +02:00
fieldOfView
46fc478f9d
Tweak disabled appearance
2017-10-24 11:15:33 +02:00
fieldOfView
a9f2ad7ca3
Hide manual controls for outputdevices that don't support it
2017-10-24 11:03:51 +02:00
alekseisasin
b0c54bb26a
Merge pull request #905 from Ultimaker/snappier_camera_animation
...
Make camera animation feel snappier
2017-10-24 10:36:55 +02:00
ChrisTerBeke
b50f027c83
Add not supported role to profiles model
2017-10-24 10:25:53 +02:00
fieldOfView
6294900bc7
Disable controls when manual control is not available
2017-10-24 10:23:07 +02:00
ChrisTerBeke
35684e0aa4
Move profiles dropdown text generator to separate method
2017-10-24 09:57:48 +02:00
fieldOfView
9cd8869382
Add settable jog distance
2017-10-23 22:27:05 +02:00
fieldOfView
56fa7036b3
Add controls for jogging the head/bed
2017-10-23 21:27:53 +02:00
ChrisTerBeke
3794ae16ae
Dont show layer height text in profiles drop down when there is not layer height set - CURA-4451
2017-10-23 17:41:58 +02:00
ChrisTerBeke
d018e0b2bb
First steps towards salvation - CURA-4451
2017-10-23 17:34:31 +02:00
alekseisasin
f6cd7327d3
Merge pull request #2660 from Ultimaker/CURA-4447_UPDATE_INSTANCE_CONTAINER
...
Cura 4447 update instance container
2017-10-23 16:27:21 +02:00
ChrisTerBeke
3ef680af5e
Merge branch 'master' into CURA-4451_not_support_container
2017-10-23 15:57:11 +02:00
ChrisTerBeke
d2ef373d19
Also apply container changes when no user interaction is required - CURA-4447
2017-10-23 15:50:42 +02:00
ChrisTerBeke
560be2931a
Create empty not supported container dynamically when no qualities are found - CURA-4451
2017-10-23 15:41:45 +02:00
Jack Ha
c56d135b15
Merge branch 'master' of github.com:Ultimaker/Cura
2017-10-23 14:20:22 +02:00
Jack Ha
4cfd0de580
CURA-4248 hide settings in UI for Surface Energy and Adhesion Tendency
2017-10-23 14:20:10 +02:00
ChrisTerBeke
c132300fd5
start
2017-10-23 13:56:26 +02:00
ChrisTerBeke
ff732720ca
Set quality slider active index to -1 for user created profile, fix for CURA-4466
2017-10-23 12:45:07 +02:00
ChrisTerBeke
e63616ca41
Update method description - CURA-4447
2017-10-23 11:43:15 +02:00
ChrisTerBeke
4bd132943c
Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER
2017-10-23 11:41:39 +02:00
ChrisTerBeke
2361e96e29
Wait with updating active stack variant and material until dialog was closed - CURA-4447
2017-10-23 11:41:20 +02:00
Diego Prado Gesto
eb0b08a813
CURA-4470 Hide quality slider handle when quality profile doesn't exist
2017-10-22 18:35:05 +02:00
Buco
f1d125b232
Added quality profiles
...
Made some changes to the main profiles and added quality profiles for each material.
2017-10-20 16:09:26 +02:00
Brecht Nuyttens
33e42493fd
Merge remote-tracking branch 'refs/remotes/Ultimaker/master'
2017-10-20 15:18:17 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible
...
This ensures that we only load those containers that we actually need the data of.
Contributes to issue CURA-4243.
2017-10-20 15:09:45 +02:00
ChrisTerBeke
09ed53b4ec
Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER
2017-10-20 12:38:12 +02:00
ChrisTerBeke
9f73f79b2f
Update simple mode manager states when manager is created - CURA-4466
2017-10-20 12:37:59 +02:00
ChrisTerBeke
95a2559607
indent
2017-10-20 12:34:35 +02:00
