3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-01-18 05:45:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
15942 commits 351 branches 328 tags 792 MiB
Commit graph

8 commits

Author SHA1 Message Date
fieldOfView
4d1fce18cb Merge branch '3.5' into bb-3.5 
# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputDevice.py
#	resources/qml/Preferences/Materials/MaterialsPage.qml
#	resources/qml/SaveButton.qml
 2018-09-12 16:12:01 +02:00
Jaime van Kessel
1180fad62f Fix binding loop 2018-08-09 11:33:04 +02:00
fieldOfView
e1be4e6470 Fix a theming issue 2018-07-08 20:11:16 +02:00
Jaime van Kessel
99de75a3fd Fixed connection label state 
CL-541
 2018-01-08 13:44:20 +01:00
ChrisTerBeke
39921795ce Properly align printer not connected label from top 2018-01-05 14:46:16 +01:00
Jaime van Kessel
b6ebb804ba OutputDevice header now shows name of active printer 
CL-541
 2018-01-04 10:13:55 +01:00
Jaime van Kessel
89004b8df5 Fixed some QML warnings 
CL-541
 2017-12-19 17:19:04 +01:00
Jaime van Kessel
e3d07f1806 Moved ExtruderBox and OutputDeviceHeader to their own files. 
This makes it a whole lot easier to get an overview.

CL-541
 2017-11-21 16:06:30 +01:00