3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-23 19:01:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Solved merge conflict

Browse source
This commit is contained in:
Jack Ha 2016-07-19 10:27:59 +02:00
commit 0bf037a160
6 changed files with 61 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -89,6 +89,7 @@ class CuraEngineBackend(Backend):
self._always_restart = True #Always restart the engine when starting a new slice. Don't keep the process running. TODO: Fix engine statelessness.
self._process_layers_job = None #The currently active job to process layers, or None if it is not processing layers.
self._backend_log_max_lines = 200 # Maximal count of lines to buffer
self._error_message = None #Pop-up message that shows errors.
self.backendQuit.connect(self._onBackendQuit)

2
plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml
View file

@ -196,7 +196,6 @@ Cura.MachineAction
visible: checkupMachineAction.usbConnected
Button
{
height: 20
text: checkupMachineAction.heatupHotendStarted ? catalog.i18nc("@action:button","Stop Heating") : catalog.i18nc("@action:button","Start Heating")
onClicked:
{
@ -259,7 +258,6 @@ Cura.MachineAction
Button
{
text: checkupMachineAction.heatupBedStarted ?catalog.i18nc("@action:button","Stop Heating") : catalog.i18nc("@action:button","Start Heating")
height: 20
onClicked:
{
if (checkupMachineAction.heatupBedStarted)