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

Merge branch 'master' into feature_preheat_extruder

Browse source 
# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputController.py
#	plugins/USBPrinting/USBPrinterOutputDevice.py
This commit is contained in:
fieldOfView 2018-01-27 16:35:55 +01:00
commit ed9943c732
114 changed files with 3794 additions and 3108 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/PrinterOutput/NetworkedPrinterOutputDevice.py
View file

@ -100,7 +100,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
if batched_lines_count >= max_chars_per_line:
file_data_bytes_list.append(self._compressDataAndNotifyQt("".join(batched_lines)))
batched_lines = []
batched_lines_count
batched_lines_count = 0
# Don't miss the last batch (If any)
if len(batched_lines) != 0: