3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 05:07:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10639 commits 306 branches 270 tags 779 MiB
Commit graph

14 commits

Author SHA1 Message Date
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0" 
This reverts commit b62c19206f, reversing
changes made to 104926c6ed.

Contributes to issue CURA-4414.
 2017-10-05 10:28:54 +02:00
Ghostkeeper
1d7792861d
Merge branch '3.0' 
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
 2017-10-02 17:40:24 +02:00
Jack Ha
5a3e427450 CL-228 when adding a Cura Connect printer, do not ask authentication, it is always authenticated 2017-10-02 14:20:41 +02:00
Ghostkeeper
df14ea2b1a
Proper capitalisation of 'OK' 
This is consistent with the rest.

Contributes to issue CURA-4341.
 2017-09-27 17:32:24 +02:00
Ghostkeeper
d417bfc7cc
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-27 14:20:38 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect 
CURA-4376
 2017-09-27 10:29:48 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
Jaime van Kessel
021425ee06 Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura 2017-07-26 16:49:28 +02:00
Ghostkeeper
dbcf50162f
Fix spelling of combined English words 
Contributes to issue CURA-3998.
 2017-07-18 13:10:17 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Ghostkeeper
bd361e500c
Don't keep a copy of currently connected printer 
This QML file was holding a copy of the currently connected printer, stored in connectingToPrinter. This copy got out of sync when you load a project file which had a different connected printer. Instead, ask the manager for the currently connected printer key every time you click the button.

Contributes to issue CURA-3839.
 2017-05-19 12:30:17 +02:00
Lipu Fei
314fa8b1c8 Fix Enter key trigger for UM3 Add Printer dialog 2017-05-04 15:27:29 +02:00
Lipu Fei
c2dff9fcd9 Accept Enter key on UM3 Add Printer Dialog 2017-05-03 13:58:58 +02:00
Jaime van Kessel
ef4ad8d2ac Renamed um3networkprintingplugin to um3networkprinting 
CURA-2862
 2016-11-25 11:34:49 +01:00
Renamed from plugins/UM3NetworkPrintingPlugin/DiscoverUM3Action.qml (Browse further)