3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
19507 commits 307 branches 272 tags 787 MiB
Commit graph

5054 commits

Author SHA1 Message Date
Jaime van Kessel
6fbbed9c06 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 10:51:33 +02:00
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName() 
CURA-6449
 2019-04-29 13:28:18 +02:00
Ghostkeeper
9aa11ed091
Merge branch '4.1' 2019-04-26 14:15:21 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Jaime van Kessel
f48bc7a047 Fixed highlighting matching configuration if a material is empty 2019-04-26 12:00:57 +02:00
Jaime van Kessel
c32c642ba5 Fixed highlighting matching configuration if a material is empty 2019-04-26 11:59:16 +02:00
Jaime van Kessel
8210317c91 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-26 11:04:55 +02:00
Jaime van Kessel
ac8cca31d1
Merge pull request #5667 from Ultimaker/CURA-6478_drag_expandable_component 
Make Expandable Components Draggable [CURA-6478]
 2019-04-26 11:03:52 +02:00
Lipu Fei
fcbec80ca0 Merge remote-tracking branch 'origin/4.1' 2019-04-26 07:42:45 +02:00
Remco Burema
ad9fc62ff5 Fix typing. [CURA-6478] 2019-04-25 23:05:52 +02:00
Jaime van Kessel
5f76070f05 Fix situation where authtoken wasnt updated for the toolbox request headers 2019-04-25 16:16:44 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Jaime van Kessel
078707a726 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-04-25 14:12:15 +02:00
Jaime van Kessel
da736cc4be Add import redirects with deprecation warning so we don't break plugin compatibility 2019-04-25 14:11:42 +02:00
Lipu Fei
4948fad87c Merge remote-tracking branch 'origin/4.1' 2019-04-25 13:22:23 +02:00
Lipu Fei
0501ae2fbc Handle case that printer type can be human readable string 
CURA-6449
 2019-04-25 13:14:28 +02:00
Lipu Fei
b22073e170 Add timeout for manual IP requests 
CURA-6483
 2019-04-25 11:54:32 +02:00
Lipu Fei
9868dee474 Fix typing 
CURA-6483
 2019-04-25 08:57:57 +02:00
Lipu Fei
2e32b33bbb Merge remote-tracking branch 'origin/4.1' 2019-04-25 08:48:34 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Remco Burema
37fddaee5c Limit draggable component to the main window. 2019-04-25 08:43:36 +02:00
Jaime van Kessel
b2e2f088c4 Add even more logging to the auth service 2019-04-24 16:44:13 +02:00
Jaime van Kessel
b1375a9927 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-24 16:17:43 +02:00
Jaime van Kessel
d69eb89f17 Fix refresh token not being stored in the bootup refresh case 2019-04-24 16:03:12 +02:00
Lipu Fei
5fc91e797e Remove mistake code 2019-04-24 13:22:53 +02:00
Lipu Fei
24f28fe03e Calculate AABB for non printing meshes 
CURA-6480
 2019-04-24 13:06:01 +02:00
Lipu Fei
3c43864dac Revert "Fix crash when moving the support eraser" 
This reverts commit 3a195e9678.

CURA-6480
 2019-04-24 11:28:50 +02:00
Lipu Fei
3a195e9678 Fix crash when moving the support eraser 
CURA-6480
 2019-04-24 11:04:33 +02:00
Jaime van Kessel
d0925d6790 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-24 10:45:39 +02:00
Jaime van Kessel
c694e530be Fix changes in per object settings not triggering reslice 
Contributes to #5639
 2019-04-24 10:45:06 +02:00
Lipu Fei
1b9bf6f0b9 Add optional empty placeholder for CuraView 
CURA-6469
 2019-04-24 09:10:21 +02:00
Lipu Fei
4876d5af00 Fix data saving before making a backup 
CURA-6471
 2019-04-24 08:21:11 +02:00
Lipu Fei
f5668df127 Add parent to models so QML dont take ownership 2019-04-18 15:54:23 +02:00
Jaime van Kessel
39072a1498 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-18 09:29:36 +02:00
Jaime van Kessel
48f37d03a4 Add debug log for when we are refreshing the access token 2019-04-18 09:29:04 +02:00
Lipu Fei
427cfdc4b2 Merge remote-tracking branch 'origin/master' into CURA-6435_new_style_add_machine 2019-04-18 07:53:13 +02:00
Jaime van Kessel
849e968edb Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-17 16:12:02 +02:00
Jaime van Kessel
d8f193870f Added more logging to the authorization service 2019-04-17 16:11:39 +02:00
Remco Burema
d72911df84 Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-17 14:00:45 +02:00
Lipu Fei
47f9741d9d Sort network printer names in list 
CURA-6449
 2019-04-17 13:35:40 +02:00
Remco Burema
4c214f5b2d
Merge pull request #5611 from Ultimaker/CURA-6449_fix_non_host_printers 
CURA-6449 Disable printers that are not host of a group
 2019-04-17 13:06:38 +02:00
Jaime van Kessel
ef92aad6bb Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6435_new_style_add_machine 2019-04-17 11:06:30 +02:00
Jaime van Kessel
f2044998ae
Merge pull request #5604 from Ultimaker/CURA-6447_fix_start_onboarding 
CURA-6447 Fix start onboarding
 2019-04-17 10:59:23 +02:00
Lipu Fei
46fa45768a Simplify shouldShowWelcomeDialog() 
CURA-6447
 2019-04-17 09:35:01 +02:00
Lipu Fei
ce5682aa74 Check type by ID in isUnknownMachineType() 
CURA-6449
 2019-04-17 09:32:34 +02:00
Ghostkeeper
6b139a9dce
Merge branch 'deprecate_some_mm_funcs' 2019-04-16 16:29:14 +02:00
Ghostkeeper
325e60d821
Correct renamed welcome check function 
Contributes to issue CURA-6435.
 2019-04-16 15:28:32 +02:00
Jaime van Kessel
c2a00d6b53 Fix copy paste error 
Simple fix that caused crash for getHasVariantBuildplates
 2019-04-16 10:53:06 +02:00
Jaime van Kessel
8267ef670a Greatly decrease amount of tickles to the backend for settingOverrideDecorator 2019-04-15 17:59:27 +02:00
Jaime van Kessel
abb13e8992 Prevend unneeded tickles of the backend for setting override decorators 2019-04-15 17:52:13 +02:00