From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Thu, 15 Jan 2015 19:19:24 +0000 (-0500)
Subject: Merge tag '14.12' into upstream
X-Git-Tag: lulzbot-14.12-rc1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=712fe87b4a0e0fe4242aa620cc36ff0efb039f03;p=cura.git

Merge tag '14.12' into upstream

Conflicts:
	Cura/gui/app.py
	Cura/gui/configWizard.py
	Cura/gui/firmwareInstall.py
	Cura/util/bigDataStorage.py
	Cura/util/profile.py
	package.sh
---

712fe87b4a0e0fe4242aa620cc36ff0efb039f03
diff --cc Cura/gui/printWindow.py
index eb2eb250,5f3cb063..6356df64
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@@ -497,11 -443,7 +497,14 @@@ class printWindowBasic(wx.Frame)
  			info += ' Bed: %d' % (self._printerConnection.getBedTemperature())
  		info += '\n\n'
  		self.statsText.SetLabel(info)
 +		if connection.isPrinting() != self._isPrinting:
 +			self._isPrinting = connection.isPrinting()
 +			preventComputerFromSleeping(self._isPrinting)
 +
 +
++	def _addTermLog(self, msg):
++		pass
+ 
  	def _addTermLog(self, msg):
  		pass