3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12694 commits 302 branches 270 tags 770 MiB
Commit graph

12694 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jack Ha
d19015e85f CURA-4523 solved merge conflict 2018-01-04 10:47:24 +01:00
Simon Edwards
2588e11364 Improve and simplify how we hold on to form part objects 
CL-541
 2018-01-04 10:43:50 +01:00
ChrisTerBeke
11a4845931 Move CuraSceneController together with rest of scene related code 2018-01-04 10:41:25 +01:00
jack
915f7273d5
Merge pull request #3029 from Ultimaker/CURA-4525-multi-build-plate-merge 
CURA-4525 multi build plate (master merged 2018-1-3)
 2018-01-04 10:33:40 +01:00
Jack Ha
a5d9aac91b CURA-4525 placed view menu items in Build Plate submenu 2018-01-04 10:32:54 +01:00
Jaime van Kessel
4cb7bc03ad Sidebar tooltips are now visible again 
CL-541
 2018-01-04 10:30:03 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
ChrisTerBeke
46827b9295 Fix tevo blackwidow json file 2018-01-04 10:14:55 +01:00
Jaime van Kessel
b6ebb804ba OutputDevice header now shows name of active printer 
CL-541
 2018-01-04 10:13:55 +01:00
Jaime van Kessel
6cf6d51fea Queued and printing amount now gets updated on state change 
CL-541
 2018-01-04 10:06:09 +01:00
Jaime van Kessel
9e055f0340 Added missing parameter 
CL-541
 2018-01-04 10:04:00 +01:00
Jaime van Kessel
faa4af634a Show pause text even if there is nothing to pause 
CL-541
 2018-01-04 09:58:15 +01:00
ChrisTerBeke
0c504560fa
Merge pull request #3057 from thetobby/master 
Adding printer definition for Anycubic i3 Mega & Tevo Black Widow
 2018-01-04 09:57:31 +01:00
Jack Ha
840eedbb3d CURA-4525 switch back to build plate 0 when deleting all objects 2018-01-04 09:35:23 +01:00
Jack Ha
8c7a0d4a8e CURA-4525 created CuraSceneController and took out logic from ObjectsModel and BuildPlateModel 2018-01-04 09:26:15 +01:00
ChrisTerBeke
4e10d6ee87
Merge pull request #3030 from TheAssassin/patch-1 
Reduce amount of movements after print for Tevo Tarantula
 2018-01-03 17:49:50 +01:00
Ghostkeeper
e18b3b3669
Remove duplicate setting 
Some merge conflict, I think.

Contributes to issue CURA-4523.
 2018-01-03 17:29:49 +01:00
Jaime van Kessel
42b50bf749 Fixed typo in function 
CL-541
 2018-01-03 17:14:52 +01:00
Lipu Fei
7c4a122767 Fix container_index for MachineSettingsAction 
CURA-4708
 2018-01-03 17:04:40 +01:00
Jaime van Kessel
801875fb30 Merge branch 'network_rewrite' of github.com:Ultimaker/Cura into network_rewrite 2018-01-03 17:00:49 +01:00
Jaime van Kessel
487fca31dd Chopped up bunch of functions. 
As per review request. CL-541
 2018-01-03 16:59:05 +01:00
Aleksei S
8aa0cc981b Merge branch 'master' of github.com:Ultimaker/cura 2018-01-03 16:46:10 +01:00
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar 
CURA-4642
 2018-01-03 16:45:26 +01:00
Lipu Fei
cbf6f55fd8 Fix perfered material search in auto-update 
CURA-4708
 2018-01-03 16:42:57 +01:00
ChrisTerBeke
80324900b0
Merge pull request #3068 from fieldOfView/feature_multiextruder_replacement_patterns 
Multiextruder gcode snippet replacement patterns
 2018-01-03 16:31:25 +01:00
Lipu Fei
47a12b4128 Prefer materials from the same brand in auto-update 
CURA-4708
 2018-01-03 16:29:19 +01:00
Lipu Fei
b181860f1c Fix afterOnEditingFinished() 
CURA-4708
 2018-01-03 16:29:18 +01:00
ChrisTerBeke
5a9e3a8efd Fix front view button rotation, cleanup view buttons onClicked 2018-01-03 16:18:31 +01:00
Simon Edwards
3173eb6740 Avoid mega-tons of object copying when building compressed gcode 
CL-541
 2018-01-03 16:15:12 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding 
CURA-4708
 2018-01-03 15:58:30 +01:00
Jack Ha
9e5f0e10b9 CURA-4525 add comment and type hint 2018-01-03 15:49:31 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
Jack Ha
3991dee14c Merge branch 'CURA-4525-multi-build-plate-merge' of github.com:Ultimaker/Cura into CURA-4525-multi-build-plate-merge 2018-01-03 15:22:09 +01:00
Jack Ha
e7e5729006 CURA-4525 deselect after move to build plate and build plate change 2018-01-03 15:21:56 +01:00
Ian
e0c2a9e4c7 Fix for CURA-4111 
When centering a scene node, TranslateOperation is used in lieu of SetTransformOperation, to avoid combinations of mirror operations behaving like rotation operations. Instead, any given node is simply translated to 0,0,0.
 2018-01-03 15:13:56 +01:00
ChrisTerBeke
08322d0a5e Move all decorators in the scene subfolder 2018-01-03 15:09:19 +01:00
ChrisTerBeke
62b06b063b Also move other operations into operations subfolder 2018-01-03 15:06:20 +01:00
ChrisTerBeke
a5630e5c54 Move all arranging related code into a subfolder 2018-01-03 15:05:06 +01:00
Jack Ha
2f965cc053 CURA-4525 switch locations of build plates and objects list 2018-01-03 14:18:40 +01:00
ChrisTerBeke
182e7de07d
Merge branch 'master' into network_rewrite 2018-01-03 14:17:48 +01:00
ChrisTerBeke
7eb507484b hide sidebar header when in monitoring mode 2018-01-03 14:12:45 +01:00
Jaime van Kessel
e12a2fbd6a Fixed typing 
CL-541
 2018-01-03 14:07:34 +01:00
ChrisTerBeke
1686f951c9 Finish styling mode switch buttons 2018-01-03 14:02:35 +01:00
Jaime van Kessel
c1bf87bd8f Removed commented out code 
CL-541
 2018-01-03 13:54:15 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
ChrisTerBeke
4f77b2ea6d More layout and font fixes 2018-01-03 13:50:06 +01:00
ChrisTerBeke
1476e95adc Fix mode switching buttons functionality 2018-01-03 13:45:18 +01:00
Jaime van Kessel
ef46f51497 Camera delete now triggers the correct function 
CL-541
 2018-01-03 13:44:38 +01:00
Jack Ha
dd989a1a51 CURA-4525 refresh objects list of all items after changing build plate 2018-01-03 13:43:09 +01:00
ChrisTerBeke
b7aadbe3c3 Fix extruder dropdown text model 2018-01-03 13:08:20 +01:00