3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
12250 commits 312 branches 275 tags 718 MiB
Commit graph

12250 commits

This branch
This branch
All branches
Author SHA1 Message Date
ChrisTerBeke
02b681a8f2 Fixes for slicing 2018-01-16 15:10:16 +01:00
ChrisTerBeke
d19b2fb8d9 Fix merge conflicts with master 2018-01-16 09:11:30 +01:00
Ghostkeeper
e7c5120f9c
Merge branch '3.2' 2018-01-15 16:52:28 +01:00
Ghostkeeper
064a8e6f6c
Elide labels next to checkboxes 
To the available width, if there is a width.
This won't work for right-to-left languages though...

Contributes to issue CURA-4692.
 2018-01-15 16:41:33 +01:00
Aleksei S
38ae75637a Revert "Fix: Cura update setting after delay" 
This reverts commit f823a98708.
 2018-01-15 16:15:36 +01:00
Aleksei S
8498946de1 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-15 15:40:10 +01:00
Aleksei S
f823a98708 Fix: Cura update setting after delay 
CURA-4785
 2018-01-15 15:39:25 +01:00
Lipu Fei
616615067c Fix quality name in selected profile box 
CURA-4796
 2018-01-15 15:17:15 +01:00
Lipu Fei
9a5b215814 Do not show not supported when there are supported profiles 
CURA-4796
 2018-01-15 15:16:43 +01:00
Lipu Fei
784707bb85 Stay on the same build plate after everything is removed 
CURA-4795
 2018-01-15 14:42:22 +01:00
Ian Paschal
dac67ef2fc
Merge pull request #3134 from Ultimaker/3.2 
Fix for CURA-4789
 2018-01-15 14:41:23 +01:00
Ian Paschal
5280501660 Fix for CURA-4789 
`deleteAll()` within `CuraApplication.py` used to only delete all scene nodes but now also resets the print information, as deleting all scene nodes _should_ do that by default. Timer now resets to 0, and project name is reset.
 2018-01-15 14:40:01 +01:00
Lipu Fei
03bd4d8d22 Fix profile menu text for custom profiles based on not supported 
CURA-4796
 2018-01-15 14:29:52 +01:00
Lipu Fei
a3c2635648 Fix profile manager to support not supported custom profiles 
CURA-4796

Profile manager should be able to show custom profiles that are based on
the not supported profile correctly.
 2018-01-15 14:29:52 +01:00
Lipu Fei
1d104f367d Do not show not supported in profile manager 
CURA-4796
 2018-01-15 14:29:51 +01:00
Lipu Fei
4abbd4b988 Show custom qualities based on not supported 
CURA-4796
 2018-01-15 14:29:51 +01:00
Ghostkeeper
5d947b8981
Merge branch '3.2' 2018-01-15 13:58:40 +01:00
Ghostkeeper
73840f6bfc
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-15 13:57:48 +01:00
Ghostkeeper
e6cd6c2645
Replace travel_speed with speed_travel 
That travel_speed is a very old setting name. I'm guessing that people were copy-pasting that from older versions of Cura.
 2018-01-15 13:57:38 +01:00
Ghostkeeper
b4a06217df
Replace travel_speed with speed_travel 
That travel_speed is a very old setting name. I'm guessing that people were copy-pasting that from older versions of Cura.
 2018-01-15 13:55:35 +01:00
ChrisTerBeke
41dec889ac Also emit a back-end slicing error when the job result is an actual error 2018-01-15 11:52:15 +01:00
Lipu Fei
dc596d0e1e Only remove selectable nodes in deleteAll() 
CURA-4795

Otherwise, after loading a project file, all nodes including the
machine will be removed and you don't see the machine any more.
 2018-01-15 11:12:09 +01:00
Lipu Fei
b60903afc2 Fix setting new ID in project loading 
CURA-4795
 2018-01-15 11:02:52 +01:00
Lipu Fei
20e7fe911f Only save models on the active build plate in 3MFWriter 
CURA-4792
 2018-01-15 10:49:38 +01:00
Lipu Fei
87dc3535bb Use isinstance() for SceneNode type check 
CURA-4525
 2018-01-15 09:59:41 +01:00
Jack Ha
c5c357d126 Fixed merge conflicts of cherry picking dimensions fix 2018-01-15 09:48:17 +01:00
ChrisTerBeke
6433619b2f Merge branch 'master' into feature_headless_docker 2018-01-15 09:30:47 +01:00
ChrisTerBeke
33da81d0d2 Check if scene has gcode_dict attribute before trying to get it 2018-01-15 09:18:57 +01:00
ChrisTerBeke
bd1bf2caaf Add use_gui flag in application, don't use theme functions when not using gui 2018-01-12 17:38:47 +01:00
Lipu Fei
b54b075cc9 Use isinstance() instead or issubclass() 
CURA-4525
 2018-01-12 16:42:34 +01:00
ChrisTerBeke
1a05fd5989 Merge branch 'master' into feature_headless_docker 2018-01-12 11:14:47 +01:00
Lipu Fei
51316e1dc1 Fix Prepare/Cancel button visibility conditions for manual slicing 
CURA-4525
 2018-01-12 11:14:01 +01:00
Jaime van Kessel
67aa21ba6c Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-12 11:04:32 +01:00
Jaime van Kessel
c2935759e8 Fixed broken printjob state in machines page 
CL-541
 2018-01-12 11:04:10 +01:00
ChrisTerBeke
36da402488 Merge branch '3.2' 2018-01-12 11:03:09 +01:00
ChrisTerBeke
d1b5744f57 Also fix gcode output for legacy UM3 networking, switch to monitor AFTER starting transferring G-code to catch potential errors before 2018-01-12 10:58:36 +01:00
Jaime van Kessel
1986677276 re-addded connection text 
CL-541
 2018-01-12 10:58:16 +01:00
ChrisTerBeke
06f35096ad Fix setting gcode list on output device 2018-01-12 10:54:48 +01:00
ChrisTerBeke
b086e9cb53 Fixes for UM3 network printing for multi build plate 2018-01-12 10:52:14 +01:00
ChrisTerBeke
7d6e41f6c8 Disable activate configuration button for now until sync functionality has been decided 2018-01-12 10:36:21 +01:00
ChrisTerBeke
ade86ebc45
Merge pull request #2974 from Ultimaker/network_rewrite 
Network rewrite
 2018-01-12 10:31:36 +01:00
Lipu Fei
225b03e98e No need for the extra extrudersAdded signal 
CURA-4784
 2018-01-12 09:58:07 +01:00
Lipu Fei
8b3bd71b36 Get extruders list from GlobalStack itself 
CURA-4784
 2018-01-12 09:57:34 +01:00
ChrisTerBeke
225a205d97 Fixes for material duplication and editing, small refactoring - CURA-4787 2018-01-12 09:19:03 +01:00
Jack Ha
87105e6d06 CURA-4525 fix printing dimensions 2018-01-11 14:30:59 +01:00
Aleksei S
2ca6541712 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-11 13:34:14 +01:00
Aleksei S
3f4a2c565c Fix: after extruders switch do not trigger slicing, provided a new signal 
which is triggered after adding extruder and it subscribers for property changes
 2018-01-11 13:32:05 +01:00
Jack Ha
b8a21a5eb3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-11 09:33:15 +01:00
Jack Ha
b9a99d4692 CURA-4525 fix placement on load to only avoid objects on current build plate 2018-01-11 09:33:07 +01:00
ChrisTerBeke
b2d3d15011 Fix conflicts 2018-01-11 09:06:59 +01:00