3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 09:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24910 commits 302 branches 270 tags 770 MiB
Commit graph

24910 commits

This branch
This branch
All branches
Author SHA1 Message Date
maukcc
39595d0541 HMS434 update 2020-05-15 09:28:07 +02:00
maukcc
80a886f582 HMS434 upgrade 
Added host chamber fan support
 2020-05-15 09:24:17 +02:00
grk3010
885fe32fb0 Update smoothie.def.json 
remove depreciated "category"
 2020-05-14 16:15:12 -04:00
grk3010
3d412e53b7 Make Smoothie definition Generic 
Remove quality, extruder, and nozzle profiles to make the smoothie machine definition a generic custom configuration.
 2020-05-14 16:05:27 -04:00
Ghostkeeper
5a8d411c35
Fix upgrading quality-changes profiles per extruder 
These have a slightly different syntax apparently.
I thought I tested this before. But apparently not well enough.

Contributes to issue CURA-7433.
 2020-05-14 16:44:48 +02:00
Nino van Hooff
15f813a4ff Add a sync timeout to CloudOutputDeviceManager 
Fixes an issue where printer syncing breaks when switching networks etc.

CURA-7290
 2020-05-14 15:47:45 +02:00
Nino van Hooff
a9692e3d27 Refactor setManualSyncEnabled 
CURA-7290
 2020-05-14 15:15:16 +02:00
Nino van Hooff
a3f968188f Add timeout to CloudPackageChecker request 
Prevents it from getting stuck in the SYNCING state

CURA-7290
 2020-05-14 15:14:51 +02:00
Nino van Hooff
b6b6a39989 Fix QML typo 
CURA-7290
 2020-05-14 15:13:57 +02:00
fieldOfView
321693d410 Add upgrade script to update instances of removed scripts to unified script 2020-05-14 11:38:30 +02:00
fieldOfView
172e6a0759 Merge branch 'master' into feature_unify_pause_at_height 
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/BQ_PauseAtHeight.py
 2020-05-14 08:45:38 +02:00
Alexander Gee
d7c373b720 Extract method 2020-05-13 23:55:12 -05:00
Alexander Gee
0daccce7b1 Incorperate percentage and time remaining scripts 2020-05-13 23:36:49 -05:00
Alexander Gee
83e259cd93 Rename to DisplayProgressOnLCD 2020-05-13 23:35:39 -05:00
Keleti Csaba
45f43f635d
Update geeetech_A10.def.json 
Heated bed added.
 2020-05-13 17:46:47 +02:00
Nino van Hooff
e6639eb8eb Do not reserve height for manual sync button 
CURA-7290
 2020-05-13 17:36:24 +02:00
Nino van Hooff
59b40c72f0 Additional scenarios for enabling/disabling the manual sync button 
CURA-7290
 2020-05-13 17:32:57 +02:00
Keleti Csaba
52fdf154a0
Update geeetech_A10.def.json 
Height and dept value was mixed.
XY values also corrected.
 2020-05-13 17:32:24 +02:00
Ghostkeeper
1111041a5b
Merge branch 'CURA-7433_deltacomb_move_upgrades' 2020-05-13 17:27:16 +02:00
Ghostkeeper
984836c1af
Code style: Spaces around binary operators 
Contributes to issue CURA-7433.
 2020-05-13 17:25:09 +02:00
Nino van Hooff
f78fa884c1 Only show the manual sync button after the account popup was closed 
CURA-7290
 2020-05-13 17:19:20 +02:00
Nino van Hooff
72657f15be Add padding to checked icon 
CURA-7290
 2020-05-13 16:38:42 +02:00
Nino van Hooff
6caa0360b9 Change SyncRow copy 
CURA-7290
 2020-05-13 16:35:39 +02:00
Nino van Hooff
de0ef8ae62 Change account sync date format to mm/dd/YYYY 
CURA-7290
 2020-05-13 16:15:29 +02:00
Nino van Hooff
97d1c3200b Remove unused aliases from SyncState.qml 
CURA-7290
 2020-05-13 16:14:21 +02:00
Nino van Hooff
69a4be601b Merge remote-tracking branch 'origin/master' 2020-05-13 11:39:16 +02:00
Jaime van Kessel
580bd13a76
Prevent crash if icon was not found 
Fixes CURA-A2
 2020-05-13 11:16:26 +02:00
Jaime van Kessel
384f92a516
Prevent crashes when loading objects before initialization is done 
Fixes CURA-7J
 2020-05-13 11:12:11 +02:00
Jaime van Kessel
8aabf113d2
Catch mouse events in toolpanel 
Fixes #7720
 2020-05-13 10:53:03 +02:00
sm3dp
85ca395f3f sc60 extruders name 2020-05-13 13:45:59 +08:00
sm3dp
218d789cdb change sc60 extruder left name 2020-05-13 11:02:06 +08:00
Remco Burema
6bb3c03739
Appease the tests! 
CURA-7433
 2020-05-12 18:59:10 +02:00
Remco Burema
3af8c20ccf
Deltacomb upgrade: Fix deepcopy not working for ConfigParser. 
No idea why it worked on ghostkeepers' system. It isn't supposed to: https://bugs.python.org/issue16058
CURA-7433
 2020-05-12 18:42:06 +02:00
Remco Burema
44900fad5a
Deltacomb upgrade: Fix leftover issues from last master-merge. 
CURA-7433
 2020-05-12 18:39:27 +02:00
Nino van Hooff
f34e05ac03
Merge pull request #7743 from Ultimaker/CURA-7427_Add_option_to_sign_in_with_different_account_while_waiting_for_printers 
Cura 7427 add option to sign in with different account while waiting for printers
 2020-05-12 17:39:07 +02:00
Kostas Karmas
eac4d3e463 Make login parametrized with a force_logout boolean 
Instead of using a separate function to force logging out before
login, login now has a boolean parameter that instructs it to logout
before loging in again, if the user is alread logged in. It then
starts the authorization with a force browser logout first.

CURA-7427
 2020-05-12 16:54:41 +02:00
Remco Burema
ac429d496a
Merge https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2020-05-12 16:41:05 +02:00
Jaime van Kessel
36cdf2edbe
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura 2020-05-12 16:25:39 +02:00
Peter Felecan
77b3476aae Removed old "category" attribute 2020-05-12 15:53:21 +02:00
Nino van Hooff
37992e25de Merge remote-tracking branch 'origin/CURA-7290_manual_account_sync' into CURA-7290_manual_account_sync 
# Conflicts:
#	plugins/Toolbox/src/CloudSync/CloudPackageChecker.py
 2020-05-12 15:44:36 +02:00
maukcc
1afd8cd754 HMS434 update 2020-05-12 15:44:22 +02:00
Nino van Hooff
fbc0be30ec Fix typing issue in CloudPackageChecker 
CURA-7290
 2020-05-12 15:40:53 +02:00
Jaime van Kessel
2cc6b7c54d
Appease mypy 2020-05-12 15:12:28 +02:00
Jaime van Kessel
de957ae5ec
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura into CURA-7290_manual_account_sync 2020-05-12 15:09:57 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
 2020-05-12 14:59:01 +02:00
Nino van Hooff
3ca703f00c Merge remote-tracking branch 'origin/CURA-7290_manual_account_sync' into CURA-7290_manual_account_sync 2020-05-12 14:19:51 +02:00
Nino van Hooff
903c251f34 Additional account sync documentation 
CURA-7290
 2020-05-12 14:19:36 +02:00
Kostas Karmas
898ca852f0 Fix mypy complaint about Optional type 
CURA-7427
 2020-05-12 13:40:27 +02:00
maukcc
70fa227274 HMS434 update 2020-05-12 13:32:55 +02:00
Jaime van Kessel
6af502088e
Fix typing issue 
CURA-7290
 2020-05-12 13:25:36 +02:00