GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,371 Commits 294 Branches 267 Tags
Commit Graph

5726 Commits

Author SHA1 Message Date
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Ghostkeeper
7d871e5a18
Update text for pre-login screen 
This is a new text that we got from marketing.
 2019-02-04 13:06:06 +01:00
Ian Paschal
66ed42838f Stop using depreciated API call 2019-02-04 11:53:24 +01:00
Ghostkeeper
314070acbc
Merge branch 'griehsler-master' 2019-02-04 08:26:10 +01:00
Ghostkeeper
5592d4fa60
Don't make retraction distance negative 
Apparently this got changed accidentally because of a merge in an unfortunate time.
 2019-02-04 08:25:35 +01:00
Ghostkeeper
3018b1b3d4
Merge branch 'master' of https://github.com/griehsler/Cura into griehsler-master 2019-02-04 08:22:55 +01:00
Jaime van Kessel
4aaeb8c2d5 Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0 2019-02-01 11:54:35 +01:00
Diego Prado Gesto
f7ffb3ae69
Merge pull request #4825 from Frischid/patch-2 
Update AutoDetectBaudJob.py
 2019-02-01 11:31:02 +01:00
Lipu Fei
efa26c8323 Merge remote-tracking branch 'origin/4.0' 2019-02-01 11:08:33 +01:00
Lipu Fei
18cec8dbe8 Fix typing 
CURA-6153
 2019-02-01 10:20:16 +01:00
Remco Burema
435c8deded Add 'connect_group_name' to 'group_name' rename to version-upgrade. [CURA-6153] 2019-01-31 20:25:21 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Jaime van Kessel
9a3d9dd2c1 Ensure that writeStarted is called when attempting to print via USB 2019-01-31 17:42:20 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states 
CL-1154 Monitor empty states
 2019-01-31 16:44:25 +01:00
Ian Paschal
1cd9ffefcc Improve no connection message 
Contributes to CL-1154
 2019-01-31 14:51:58 +01:00
Jaime van Kessel
1a037bdb82 Prevent UFP writer from crashing if the base file of a material can not be found 
Another issue found in the crash reports
 2019-01-31 14:48:40 +01:00
Lipu Fei
c73747ad44 Merge remote-tracking branch 'origin/4.0' 2019-01-31 14:22:59 +01:00
Jaime van Kessel
d5e34cc9c9 Prevent crash when activePrinter doesn't have a controller 
Got the crash from the automatic crash reports
 2019-01-31 12:59:29 +01:00
Ian Paschal
7189daec80 Finalize monitor stage empty states 
Contributes to CL-1154
 2019-01-31 10:50:30 +01:00
Lipu Fei
5a196423db Merge remote-tracking branch 'origin/4.0' 2019-01-31 08:47:01 +01:00
ChrisTerBeke
b884e46187
Ensure Cura stores the cloud connection type in the stack file 2019-01-30 22:02:13 +01:00
Remco Burema
dcf9ce56e4
Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options 
Cura 6115 improve message options
 2019-01-30 17:54:47 +01:00
Ian Paschal
d495e80959 Merge remote-tracking branch 'origin/4.0' into CL-1154_monitor_empty_states 2019-01-28 16:54:21 +01:00
Ghostkeeper
232498980c
Merge branch '4.0' 
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
 2019-01-28 16:45:45 +01:00
Ghostkeeper
25b18dee7a
Fix type errors 
Nothing really changed but it should be more type-safe now for the messages it creates and the build plate temperature.
 2019-01-28 16:14:01 +01:00
Ghostkeeper
371585a0ba
Fix error if layer number ends up out of range 
It normally doesn't go out of range, but some defensive coding just in case it does. And to fix a typing error of course.
 2019-01-28 15:54:34 +01:00
Ian Paschal
3dcb6b9c37
Merge pull request #5235 from Ultimaker/fix_configured_connection_types 
Fix configured connection types
 2019-01-28 15:46:39 +01:00
Jaime van Kessel
f723cdc8a3 Fix typing issues 2019-01-28 14:47:03 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types. 
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
 2019-01-28 14:29:41 +01:00
Lipu Fei
87bdd10dab Merge remote-tracking branch 'origin/4.0' 2019-01-28 14:03:51 +01:00
Simon Edwards
72b98285b1
Merge pull request #5216 from Ultimaker/CL-1188_hide_print_job_on_unavailable_printer 
CL-1188 hide print job on unavailable printer
 2019-01-28 11:08:21 +01:00
Jaime van Kessel
0fded58988 Add / fix typing 2019-01-25 13:35:24 +01:00
Ian Paschal
b9584b05ee More documentation 
Contributes to CL-1154
 2019-01-25 12:41:36 +01:00
Ian Paschal
3b8281dc5b Add some comments 
Contributes to CL-1154
 2019-01-25 12:39:27 +01:00
Ghostkeeper
33abbd4c89
Merge branch '4.0' 2019-01-25 12:03:38 +01:00
Ghostkeeper
91dc3713ae
Initialise idle count properly 
This is a field so it should always get initialised in the __init__ function.

Fixes #5218.
 2019-01-25 12:03:21 +01:00
Jaime van Kessel
cab0349a9c Change the alignent option to use the new style 
CURA-6115
 2019-01-24 18:30:52 +01:00
Ghostkeeper
41c840adbc
Cast plug-in path of self to str 
Because it can't be None.
 2019-01-24 17:34:22 +01:00
Ghostkeeper
d535008e08
Don't repeat the plug-in name 
If it changes, this will crash Cura.
 2019-01-24 17:31:08 +01:00
Ian Paschal
ee5c6ed3fb Unconnected empty state (DRAFT) 
Contributes to CL-1154
 2019-01-24 16:54:09 +01:00
Ian Paschal
f6b69f05a9 Add empty state for print job queue 
Contributes to CL-1154
 2019-01-24 15:14:16 +01:00
Ian Paschal
3d92bd0133 Prevent endless skeleton loading on Cloud 
Contributes to CL-1154

For you @christerbeke
 2019-01-24 14:46:00 +01:00
Ian Paschal
e7151390f7 Label printers without connection to "unreachable" 
Contributes to CL-1188
 2019-01-24 10:24:55 +01:00
Ian Paschal
673734ee12 Show print job context menu if state == "error" 
Contributes to CL-1175
 2019-01-24 09:52:56 +01:00
Ian Paschal
5d2a914180 Always show context menu for print jobs 
Contributes to CL-1175
 2019-01-23 15:54:11 +01:00
Ian Paschal
4438f0d9a3 Add dark mode to new context menu 
Contributes to CL-1212
 2019-01-23 15:34:28 +01:00
Ian Paschal
f5379dda55 Fix improperly removed method 2019-01-23 14:48:38 +01:00
Ian Paschal
e19323d38b Fix mising theme key 2019-01-23 14:47:59 +01:00
Ian Paschal
1097f16011 Add theme (and dark mode) 
Contributes to CL-1165
 2019-01-23 12:08:20 +01:00
Ian Paschal
32072e3bfe Merge remote-tracking branch 'origin/4.0' into CL-1165_missing_cloud_info 2019-01-23 12:05:06 +01:00