3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
13521 commits 304 branches 270 tags 779 MiB
Commit graph

3611 commits

Author SHA1 Message Date
ChrisTerBeke
c1308de753 Merge branch '3.2' 2018-01-17 11:40:06 +01:00
Diego Prado Gesto
cc89ddf5f7 Revert "Avoid zero thickness to be shown in layer view." 
I saw that with these changes, Cura crashes when loading a GCode.
This reverts commit 8dd21892d3.
 2018-01-17 11:39:38 +01:00
Diego Prado Gesto
8dd21892d3 Avoid zero thickness to be shown in layer view. 
Also fix some typos.
 2018-01-17 11:34:25 +01:00
Jaime van Kessel
4680996a49 Print window no longer gets an ever increasing list of print targets 
CL-720
 2018-01-17 11:32:43 +01:00
Lipu Fei
cb0ac9b0c8
Merge pull request #3137 from Ultimaker/feature_multiple_BP 
Feature: Printers with different build plates
 2018-01-17 10:55:46 +01:00
Jack Ha
07f0906b1c Merge branch '3.2' 2018-01-16 16:05:38 +01:00
Lipu Fei
b0d2ef0f72 Correct default material diameter value for single-extrusion machines 
CURA-4812
 2018-01-16 15:04:21 +01:00
Diego Prado Gesto
0a4c30603f Change style of Add/Remove printers link in Monitor tab 2018-01-16 13:07:27 +01:00
Diego Prado Gesto
4c29a952eb Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-16 11:59:06 +01:00
Diego Prado Gesto
aa8057e80c Change style of Add/Remove printers link in Monitor tab 2018-01-16 11:57:39 +01:00
Jack Ha
2d9e25312e Merge branch '3.2' 2018-01-16 11:50:00 +01:00
Jack Ha
a0738c2977 CURA-4808 fix extruder setting change trigger slice. re-introduce extrudersAdded signal, probably needed because of timing issues (extruder added after loading global container). it's the inversion of 225b03e98e 2018-01-16 11:49:45 +01:00
Jack Ha
a84d17dee4 Merge branch '3.2' 2018-01-16 10:57:30 +01:00
Ghostkeeper
1e892dc45c
Remove unused variables 
Contributes to issue CURA-4810.
 2018-01-16 10:53:14 +01:00
Ghostkeeper
063eb8e5cd
Don't give an error when reading normal 3MF files 
We have a signalling return value for this case. Let's use it.

Contributes to issue CURA-4810.
 2018-01-16 10:53:02 +01:00
Jack Ha
71e4d42409 CURA-4795 set build plate of newly loaded 3mf files to active build plate 2018-01-16 10:47:30 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
Jaime van Kessel
6225c12a9e Fixed crash on complete message 
In some cases a job won't have an assigned printer when it's done.

CL-716
 2018-01-16 09:44:18 +01:00
ChrisTerBeke
d19b2fb8d9 Fix merge conflicts with master 2018-01-16 09:11:30 +01:00
Diego Prado Gesto
aace0e0317 CURA-4461 Remove unused code 2018-01-15 18:10:52 +01:00
Diego Prado Gesto
0f497545bc CURA-4461 Create properties to know when a buildplate is compatible or usable. Show colors indicating the compatibility. Also minor fixes 2018-01-15 18:00:49 +01:00
Diego Prado Gesto
e51eaab08e CURA-4461 Don't allow Cura to Slice when the buildplate is not compatible with the material 2018-01-15 16:33:15 +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
Diego Prado Gesto
badf5a9043 CURA-4461 Store buildplate compatibility in the material profile 2018-01-15 14:31:52 +01:00
Ghostkeeper
5d947b8981
Merge branch '3.2' 2018-01-15 13:58:40 +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
Diego Prado Gesto
67ca4d25cd CURA-4461 Deserialize materials with buildplates compatibility 2018-01-15 11:35:17 +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
ChrisTerBeke
33da81d0d2 Check if scene has gcode_dict attribute before trying to get it 2018-01-15 09:18:57 +01:00
Lipu Fei
b54b075cc9 Use isinstance() instead or issubclass() 
CURA-4525
 2018-01-12 16:42:34 +01:00
Diego Prado Gesto
c3c44e9ac4 Compatibility with materials and buildplates 2018-01-12 16:01:48 +01:00
Jaime van Kessel
67aa21ba6c Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-12 11:04:32 +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
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
Diego Prado Gesto
de98a62dc8 CURA-4461 Read buildplate id from the printer and set the automatic 
option
 2018-01-11 13:03:35 +01:00
ChrisTerBeke
b2d3d15011 Fix conflicts 2018-01-11 09:06:59 +01:00
Jaime van Kessel
665c0a81f4 Removed wrong comment 2018-01-10 16:29:36 +01:00
Jack Ha
d91a2e1ca3 CURA-4525 move reset print information to a better place to prevent it sending info of non existent build plates 2018-01-10 16:04:56 +01:00
Jack Ha
6262003069 CURA-4525 reset the print information for build plates that are marked for slicing 2018-01-10 16:01:26 +01:00