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

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

Browse source 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
This commit is contained in:
Ghostkeeper 2018-12-04 15:21:36 +01:00
commit b5bb3232f3
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
13 changed files with 49 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/USBPrinting/AutoDetectBaudJob.py
View file

@ -3,8 +3,8 @@
from UM.Job import Job
from UM.Logger import Logger
from plugins.USBPrinting.avr_isp import ispBase
from .avr_isp import ispBase
from .avr_isp.stk500v2 import Stk500v2
from time import time, sleep

2
plugins/USBPrinting/plugin.json
View file

@ -1,7 +1,7 @@
{
"name": "USB printing",
"author": "Ultimaker B.V.",
"version": "1.0.0",
"version": "1.0.1",
"api": 5,
"description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.",
"i18n-catalog": "cura"