3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 13:47:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 18
18720 commits 306 branches 270 tags 779 MiB
Commit graph

18720 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
949a687a07 Add the logo again that I accidently deleted. 
Derp
 2019-01-30 14:51:47 +01:00
Jaime van Kessel
969ed6409c Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-30 13:37:34 +01:00
Jaime van Kessel
9ae08b4aec Moved the old logo back again 
It looks way better, so lets hope it's here to stay!
 2019-01-30 13:36:55 +01:00
Ghostkeeper
a6688b9609
Merge branch '4.0' 2019-01-30 12:59:39 +01:00
Ghostkeeper
430be551d3
Fix link to properties of row 
This fixes a QML warning and probably fixes the visibility of these elements.
 2019-01-30 12:59:27 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Ghostkeeper
14300e745f
Use Doxygen-style comments for documentation 
According to our style. Not just single line comments without anything else.

Contributes to issue CURA-6159.
 2019-01-30 12:52:58 +01:00
Remco Burema
dbec607d36
Merge pull request #5234 from Ultimaker/CURA-6070_add_adhesion_warning 
CURA-6070 Add adhesion warning message back
 2019-01-29 16:12:53 +01:00
Jaime van Kessel
805b4dbe4c Fixed height for action message buttons 
CURA-6115
 2019-01-29 13:28:32 +01:00
Lipu Fei
b70e9c9080 Handle empty hotend and material in config syncing 
CURA-5693

 - Disable an extruder if the config states no material or nozzle for
   it.
 - Show a warning message if an used extruder gets disabled.
 2019-01-29 13:06:38 +01:00
Jaime van Kessel
4151050127 Setting the height of an action button now actually changes it's size 
CURA-6115
 2019-01-29 12:57:05 +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
9d8cf5ddde
Apply division by zero prevention to the denominator 
Rather than the numerator, which could not cause a division by zero exception.
 2019-01-28 16:40: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
Ghostkeeper
4a91425bf9
Upgrade nwa3d files to setting version 7 
This was merged into 4.0 and then into master, but when merging into master it was not upgraded to version 7.
 2019-01-28 15:31:09 +01:00
Jaime van Kessel
bc8a08bb44 Add documentation to the configuredConnectionTypes 2019-01-28 14:57:24 +01:00
Jaime van Kessel
f723cdc8a3 Fix typing issues 2019-01-28 14:47:03 +01:00
Lipu Fei
e2e856a5cd Add adhesion warning message back 
CURA-6070
 2019-01-28 14:41:57 +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
Ghostkeeper
12d3af8d93
Fix type error 
The typing was added by Nallath just now but it is giving an error for me.
The private access is allowed here because we're implementing it in the same class, even though it is a different instance.

This fixes the type error a bit more strictly than what lfei just did at the same time as me.
 2019-01-28 13:50:32 +01:00
Lipu Fei
54ce6a3676 Fix typing 2019-01-28 13:40:42 +01:00
Ghostkeeper
c5eb3b0e25
Allow floating point in bed temperature 
This is consistent with the hotend temperature. Only we round it just before outputting it to g-code because the g-code doesn't support it.
This fixes a typing error that my IDE gave me.
 2019-01-28 13:35:22 +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
Lipu Fei
d7434ed14c
Merge pull request #5224 from Ultimaker/CURA-6141_info_long_material_name_line_split 
Cura 6141 info long material name line split
 2019-01-28 09:13:17 +01:00
Lipu Fei
1f21eed14f Add Text.NativeRendering for Labels 
CURA-6141
 2019-01-28 09:05:43 +01:00
Lipu Fei
c6ff8149f6 Remove colon according to design 
CURA-6141
 2019-01-28 09:04:08 +01:00
Lipu Fei
71b2787d0d Use Label 
CURA-6141
 2019-01-28 08:48:02 +01:00
steverc1572
b3205ce84e
Add files via upload 2019-01-26 14:43:07 -06:00
steverc1572
7aad7ab59c
Delete cr-x.stl 2019-01-26 14:42:01 -06:00
Remco Burema
3d413ceb2c MaterialInfo: Tweak text-alignment/layout. [CURA-6141] 2019-01-26 11:43:15 +01:00
Remco Burema
e7ff70870f MaterialInfo: Also replace HTML-text with QML-elements for 'by line-type'. [CURA-6141] 2019-01-26 11:25:38 +01:00
Jaime van Kessel
ad5a6a4153 Added missing typing 2019-01-25 14:09:41 +01:00
Jaime van Kessel
67a63e7954 Add test for gcodeListDecorator 
It's super simple, but hey, it's also easy to write.
 2019-01-25 14:04:53 +01:00
Jaime van Kessel
c7e3b1dcaf Addded test for removing machine action 2019-01-25 14:00:26 +01:00
Jaime van Kessel
76cfb19dfb Removed unused function & added more typing 2019-01-25 13:52:41 +01:00
Jaime van Kessel
0fded58988 Add / fix typing 2019-01-25 13:35:24 +01:00
Jaime van Kessel
13b2b33900 Remove unused theme option 2019-01-25 13:02:39 +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
228614a590 Remove unused values from theme.json 
CURA-6115
 2019-01-25 11:20:50 +01:00
Jaime van Kessel
8f8b13f7c4 Let Cura define how the message actions look like 
CURA-6115
 2019-01-25 11:07:37 +01:00
Simon Edwards
064e61c262
Merge pull request #5215 from Ultimaker/CL-1175_context_menu_for_cant_print_jobs 
CL-1175 Context menu for cant print jobs
 2019-01-25 10:53:15 +01:00
Remco Burema
7fdbb11f49 MaterialInfo: Put height and fonts by QML-elements for 'by material-type'. [CURA-6141] 2019-01-24 21:56:57 +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