3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 15:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '3.5' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2018-09-13 16:23:55 +02:00
commit 757c8754b1
25 changed files with 50 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -891,7 +891,7 @@ Cura.MachineAction
{
id: machineHeadPolygonProvider
containerStackId: base.acthiveMachineId
containerStackId: base.activeMachineId
key: "machine_head_with_fans_polygon"
watchedProperties: [ "value" ]
storeIndex: manager.containerIndex

1
plugins/SimulationView/SimulationView.qml
View file

@ -670,6 +670,7 @@ Item
onCurrentLayerChanged:
{
playButton.pauseSimulation()
pathSlider.setHandleValue(0) // After updating the layer set Path slider to 0
layerSlider.setUpperValue(UM.SimulationView.currentLayer)
}
}

2
plugins/Toolbox/src/Toolbox.py
View file

@ -626,7 +626,7 @@ class Toolbox(QObject, Extension):
# HACK: Do nothing because we'll handle these from the "packages" call
if type in do_not_handle:
return
continue
if reply.url() == url:
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200: