GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 05:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 290 Branches 260 Tags
Commit Graph

19026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisTerBeke
de24c7d9c3 Revert "Remove mock changes used locally" 
This reverts commit 7785555a943b600636809ae5c5e50cabecdd79fd.
 2019-01-15 09:35:28 +01:00
Daniel Schiavini
7785555a94 Remove mock changes used locally 2019-01-15 08:21:17 +01:00
Daniel Schiavini
77c30c891f Fix tests 2019-01-15 08:20:39 +01:00
Diego Prado Gesto
f16735a5be Add VersionUpgrade40to41 as a bundled package 
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
 2019-01-14 17:10:52 +01:00
Diego Prado Gesto
bf20e04b0d Merge branch '4.0' 2019-01-14 17:03:12 +01:00
Diego Prado Gesto
fa7b38243c Add VersionUpgrade35to40 as a bundled package 
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
 2019-01-14 17:02:02 +01:00
ChrisTerBeke
f478653c37 Uncomment code that was needed for testing 2019-01-14 14:56:14 +01:00
Jaime van Kessel
090fdbf598 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-14 14:17:40 +01:00
ChrisTerBeke
7bf319dfd1 Better fix for circular dependency 2019-01-14 14:17:36 +01:00
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00
Jaime van Kessel
b1b61fa466 Add missing return 2019-01-14 14:14:47 +01:00
Jaime van Kessel
5ae05acd2c Merge branch 'fix_non_connect_networkprinters' of https://github.com/fieldOfView/Cura into 4.0 2019-01-14 14:12:36 +01:00
Jaime van Kessel
9d94b55596 Ensure that the toolbox correctly handles multiple supported SDK versions 
CURA-6087
 2019-01-14 13:35:10 +01:00
Lipu Fei
71036abd87 Add troubleshooting link for recommended 
CURA-6114
 2019-01-14 12:11:45 +01:00
Lipu Fei
b2dace2d48 Fix version upgrade 
CURA-6113
 2019-01-14 11:25:02 +01:00
Lipu Fei
6876935359 Merge remote-tracking branch 'origin/4.0' 2019-01-14 11:21:28 +01:00
ChrisTerBeke
cd19eec98a Remove weird argument for timer 2019-01-14 11:06:16 +01:00
Lipu Fei
0ecd00fa1f
Merge pull request #5150 from Ultimaker/CURA-6054-2_fix_resize_panel_on_window_change 
Fix resizable Settings-Panel for change in window size. [CURA-6054]
 2019-01-14 11:01:46 +01:00
ChrisTerBeke
402097f4d0 Fix imports 2019-01-14 10:57:50 +01:00
Lipu Fei
29bb317293 Add a margin to settings panel bottom 
CURA-6054
 2019-01-14 10:55:03 +01:00
ChrisTerBeke
1e2a8aa23e revert to prevent circular dependency 2019-01-14 10:52:50 +01:00
ChrisTerBeke
13d390a7d9 Fix imports in tests, some cleanup 2019-01-14 10:43:32 +01:00
ChrisTerBeke
81abc84741 Fix typing of CloudOutputDevice in controller 2019-01-14 10:41:10 +01:00
Diego Prado Gesto
c6da824203 Merge branch '4.0' 2019-01-14 08:56:33 +01:00
Diego Prado Gesto
dacc161745
Merge pull request #4961 from h0x91b/patch-1 
default is 2650, not 2620, probably typo
 2019-01-13 17:35:59 +01:00
Diego Prado Gesto
c11e0cecc8 Remove loading gif 
Instead of an external gif, use the BusyIndicator that exists in the ActionButton.
 2019-01-13 16:58:38 +01:00
fieldOfView
f8bfca6079 Don't show auto configuration selection when there are no configurations 2019-01-11 18:27:44 +01:00
fieldOfView
d03ec22dee Hide empty abbreviated machinename 
Connected printers that are not Cura Connect printers may not have a connect_group_name.
 2019-01-11 17:55:06 +01:00
fieldOfView
c6fa47e584 Mark PrinterOutputDevice without printer type as invalid 
Since self._printer_type was defined as an empty string and the setter only accepts strings, it could never be None
 2019-01-11 17:52:28 +01:00
fieldOfView
c81689d233 Prevent a recurring qml warning 
Note that the connect_group metadata is also queried for non-connected printers; the model is not filtered, but non-connected printers are set to be invisible.
 2019-01-11 17:40:36 +01:00
Remco Burema
7b3cf6be64 Fix resizable Settings-Panel for change in window size. [CURA-6054] 2019-01-11 17:32:15 +01:00
ChrisTerBeke
50b82e828b Merge branch '4.0' into STAR-322_cloud-connection 2019-01-11 17:20:39 +01:00
Diego Prado Gesto
801a43c874 Add a small margin in the right so the close button is never behind the scrollbar 
Contributes to CURA-6005.
 2019-01-11 17:04:51 +01:00
ChrisTerBeke
7bbd43928a Fix more review comments 2019-01-11 16:38:25 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
e465bd771a Use toolpath instead of mesh, some review fixes 2019-01-11 16:18:47 +01:00
ChrisTerBeke
d8b5f75e2a Solve some review comments 2019-01-11 16:14:55 +01:00
ChrisTerBeke
36e49ee6bb Make activeMachineIsGroup more robust 2019-01-11 16:08:46 +01:00
ChrisTerBeke
b78ac0664f Fix return types from review 2019-01-11 16:07:08 +01:00
ChrisTerBeke
2e3398e349 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-11 15:10:44 +01:00
Jaime van Kessel
3ecdd91223 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-11 14:49:06 +01:00
Jaime van Kessel
cbeadb2343 Set the font of the time estimation to medium bold 
This way it will also fit when a very long time is used in german.
If we don't do this, 14 Tages 12 Stunden 33 Minuten didn't fit.

CURA-6097
 2019-01-11 14:47:59 +01:00
Diego Prado Gesto
eaf4fefe00 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-11 14:46:47 +01:00
Diego Prado Gesto
e706020639 Improve the text when there is no configuration available 
It can happen that the list is empty because the data is still coming or because the connection has been lost.

There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.

Contributes to CURA-6011.
 2019-01-11 14:44:49 +01:00
Jaime van Kessel
2dead87593 Ensure that the installed & canUpdate properties get set correctly 
CURA-6053
 2019-01-11 14:43:56 +01:00
Jaime van Kessel
d4621ec504 Ensure that if no CuraCloudApiRoot is set that the default is used 
CURA-6005
 2019-01-11 13:20:14 +01:00
Ian Paschal
616d5a1f43 Update MonitorPrintJobCard.qml 
Contributes to CL-1165
 2019-01-11 10:43:50 +01:00
ChrisTerBeke
32ad50864e
Merge pull request #5029 from Ultimaker/STAR-347_update_cura_connect_models 
Star-347: Update Cura Connect models
 2019-01-10 17:46:26 +01:00
Jaime van Kessel
ff79e91686 Move the additional components for the save button out of the action panel 
CURA-6097
 2019-01-10 16:32:43 +01:00
Ian Paschal
8d76bd8678 Small clean-up of log warnings 
Contributes to CL-1165
 2019-01-10 16:04:57 +01:00