GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 18:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,251 Commits 295 Branches 267 Tags
Commit Graph

3235 Commits

Author SHA1 Message Date
ChrisTerBeke
d19b2fb8d9 Fix merge conflicts with master 2018-01-16 09:11:30 +01:00
Aleksei S
38ae75637a Revert "Fix: Cura update setting after delay" 
This reverts commit f823a98708dd3eed2485ff412d3fe2dd03a31f35.
 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
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
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
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
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
Jack Ha
0fdb470ec7 CURA-4525 only try to slice next build plate if there are actually build plates to slice 2018-01-10 14:39:26 +01:00
Jack Ha
dab0ebd208 CURA-4525 fix saving empty gcode giving error 2018-01-10 14:25:09 +01:00
Jack Ha
686ac2292d CURA-4525 CURA-4772 fix gcode not overlapping thoughout build plates 2018-01-10 14:13:18 +01:00
Jack Ha
80aaad83e1 CURA-4525 fix manual slice slicing more than one build plate at a time 2018-01-10 14:12:21 +01:00
jack
4751de00ae
Merge pull request #3089 from fieldOfView/feature_support_mesh_enhancements 
Support Mesh enhancements
 2018-01-10 11:58:22 +01:00
ChrisTerBeke
fd86cc84e2 check if parent exists before using width and height properties from it 2018-01-10 11:17:26 +01:00
ChrisTerBeke
56326d286f
Merge pull request #3114 from fieldOfView/fix_network_rewrite_topbar_icon 
Fix updating icon in the top bar
 2018-01-10 10:28:31 +01:00
Lipu Fei
3f341a34c6 Fix gcode job sending issue in gcode_dict refactoring 2018-01-10 08:15:03 +01:00
fieldOfView
2ce73a1839 Fix updating icon in the top bar 
This makes sure events such as onAcceptsCommandsChanges get connected if an outputdevice has been added before the monitorstage is initialized.
 2018-01-10 00:07:43 +01:00
Lipu Fei
30870c5ef2 Refactor skip reset setting 
CURA-4760
 2018-01-09 17:35:10 +01:00
Jaime van Kessel
dcf02137ad Fixed connecting for clean machine 
CL-541
 2018-01-09 14:53:16 +01:00
Diego Prado Gesto
b11b2def3e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-09 10:43:42 +01:00
Diego Prado Gesto
e3e6f301f9 CURA-4778 Add up to 8 different colors when loading a GCode, since we 
support up to 8 extruders in CFP
 2018-01-09 10:42:03 +01:00
ChrisTerBeke
6c0fb110fe Add post processing source files 2018-01-09 10:31:12 +01:00
ChrisTerBeke
9c9c46aade Remove submodule 2018-01-09 10:30:02 +01:00
ChrisTerBeke
1f2007554d Add post processing source files to main repo 2018-01-09 10:27:28 +01:00
Aleksei S
117c467829 Fix: Per mesh setting combobox did not save selected option 
CURA-4760
 2018-01-09 09:39:15 +01:00
Diego Prado Gesto
0722465fb9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-09 09:17:51 +01:00
Diego Prado Gesto
4c8c4c78da CURA-4772 Create a CuraSceneNode instead of a SceneNode when reading a 
GCode. Avoid creating an empty CuraSceneNode if the node is already an
instance of it.
 2018-01-09 09:16:21 +01:00
Lipu Fei
c8cef9583e rename scene.gcode_list to gcode_dict 
CURA-4741

With the multi build plate feature, scene.gcode_list is now a dict which
stores a list of gcode for a build plate, so it makes more sense to have
it renamed to "gcode_dict" because it's not a list.
 2018-01-08 16:18:41 +01:00
Jack Ha
c1cb86a334 CURA-4525 remove initial 'Unable to slice' 2018-01-08 14:00:06 +01:00
Jaime van Kessel
99de75a3fd Fixed connection label state 
CL-541
 2018-01-08 13:44:20 +01:00
Jack Ha
86eb9c73ba CURA-4525 do not send empty build plates gcode; direct calling slice when skipping empty build plate 2018-01-08 13:41:58 +01:00
Jack Ha
52b75b58e7 CURA-4525 allow for empty build plates between filled build plates 2018-01-08 13:25:39 +01:00
Jaime van Kessel
ed9634ebe0 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00