3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
3514 commits 302 branches 270 tags 769 MiB
Commit graph

3514 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
0faecf9b34 Rearrange MachineActions on Machines page 
CURA-1385
 2016-06-23 14:15:39 +02:00
fieldOfView
19412c5bda Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-23 14:08:49 +02:00
fieldOfView
3f7f6f8a23 Skip containers that can not be serialized 
CURA-1445
 2016-06-23 14:08:38 +02:00
Arjen Hiemstra
38ce6cd4b8 Make PerObjectSettingVisiblityHandler inherit SettingVisiblityHandler and some other cleanup 2016-06-23 13:33:51 +02:00
Arjen Hiemstra
8c8caa2cac Use the right property for the property provider 
Otherwise we get a bunch of errors from the per object settings tool
 2016-06-23 13:33:07 +02:00
Arjen Hiemstra
9f9de493f7 Clean up indentation 2016-06-23 13:32:31 +02:00
Arjen Hiemstra
cc027ddf41 Remove unused code 2016-06-23 13:32:20 +02:00
Arjen Hiemstra
10d572eae3 Fix expanded settings for Per Object settings tool 2016-06-23 13:32:04 +02:00
Arjen Hiemstra
de36122531 Use the expanded categories from Cura to expand the proper categories on startup 2016-06-23 13:31:01 +02:00
Jaime van Kessel
b14ae94190 Starting UMOCheckup before connection was established now works correctly 
CURA-1385
 2016-06-23 13:10:57 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions 
Machine actions
 2016-06-23 12:59:03 +02:00
Jaime van Kessel
6909cf211a Fixed layout 
CURA-1385
 2016-06-23 11:42:18 +02:00
Jaime van Kessel
35a8e7ca94 Added missing decorator 
CURA-1385
 2016-06-23 11:41:13 +02:00
Jaime van Kessel
d499d59d97 Restored accidental delete 2016-06-23 11:19:54 +02:00
Jaime van Kessel
cd6092581b Removed extraneous space 
CURA-1385
 2016-06-23 11:17:28 +02:00
Jaime van Kessel
3f3a93ae8a Refactoring; Renaming firstRunWizard to machineActionsWizard 
CURA-1385
 2016-06-23 11:12:58 +02:00
Jaime van Kessel
a7deb53acf Added BedLevel as supported action to UMO 2016-06-23 11:12:06 +02:00
Jaime van Kessel
45dca3f878 Refactoring (Renaming variables so they are more clear & update documentation) 2016-06-23 11:09:55 +02:00
fieldOfView
51259e2684 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-23 10:18:37 +02:00
fieldOfView
7c606b21b5 Remove some trailing spaces 
CURA-1615
 2016-06-23 10:18:27 +02:00
Aldo Hoeben
cf718a3a42 Merge pull request #818 from thopiekar/master-CURA-1445 
[CURA-1445] SliceInfo: Providing data from all containers
 2016-06-23 09:55:53 +02:00
Aldo Hoeben
097bcad427 Merge pull request #810 from thopiekar/master-CURA-1615 
[CURA-1615] Plugins: Updating GCodeProfileReader and SliceInfo
 2016-06-23 09:45:56 +02:00
Thomas Karl Pietrowski
c9ec81cbe2 Merge pull request #3 from thopiekar/master-CURA-1615 
GCodeProfileReader: Removing useless containername
 2016-06-22 23:25:36 +02:00
Thomas Karl Pietrowski
688accfab7 GCodeProfileReader: Removing useless containername 2016-06-22 23:25:04 +02:00
fieldOfView
08411e943c Reenable Per Object Settings tool in simple mode if the current printer has multiextrusion 
and tweak Per Object Settings panel size

CURA-333
 2016-06-22 18:46:24 +02:00
fieldOfView
a6bb0c804a Fix minor codereview issues 
CURA-333
 2016-06-22 17:19:14 +02:00
Jaime van Kessel
1e40d98fd7 Merge pull request #817 from Ultimaker/feature_multi_materialsnozzles 
Multiextrusion support for materials and nozzles
 2016-06-22 17:05:17 +02:00
Jaime van Kessel
a35873a31b Removed test files 
CURA-333
 2016-06-22 17:04:31 +02:00
Simon Edwards
65a8cf1c45 'One at a time' printing was broken due to a regression in the convex hull decorator. 
Contributes to CURA-1504
 2016-06-22 16:51:56 +02:00
Jaime van Kessel
cbbb204718 Merge branch 'master' of github.com:Ultimaker/Cura into feature_multi_materialsnozzles 2016-06-22 16:32:37 +02:00
fieldOfView
cdd38763f6 Tweak sidebar tab bar appearance 
CURA-1036
 2016-06-22 16:06:11 +02:00
Jaime van Kessel
23ca2a3f54 Fixed layout issues 
CURA-1385
 2016-06-22 15:37:22 +02:00
Jaime van Kessel
458749ca4e Removed old wizard pages 
CURA-1385
 2016-06-22 15:35:44 +02:00
Jaime van Kessel
1912722d31 Fixed requesting size of machine for bedLeveling 
CURA-1385
 2016-06-22 15:35:23 +02:00
Jaime van Kessel
b62118dc1c Added supported actions to all UM machines 
CURA-1385
 2016-06-22 15:29:54 +02:00
Jaime van Kessel
4e854700f1 Machine_action plugin objects are now added as list 
CURA-1385
 2016-06-22 15:24:37 +02:00
Simon Edwards
6548930d46 Merge branch 'master' into simple_convex_hull 2016-06-22 15:09:53 +02:00
Simon Edwards
631ef8e678 Reimplement the "no convex hull when using a tool" functionality. 
Contributes to CURA-1504
 2016-06-22 15:06:03 +02:00
Jaime van Kessel
5aab4686ca Layout fixes 
CURA-1385
 2016-06-22 14:50:05 +02:00
Simon Edwards
9641a25f31 Fixed up the convex hull 'shadow' creation and deletion after the merge. 
Contributes to CURA-1504
 2016-06-22 14:48:15 +02:00
Jaime van Kessel
c297b14e03 Added UMO checkup action 
CURA-1385
 2016-06-22 14:40:58 +02:00
Jaime van Kessel
d5b07d29de Actions are now reset before every run 
CURA-1385
 2016-06-22 14:39:41 +02:00
Thomas Karl Pietrowski
3ea11d3063 SliceInfo: Removing debug code 2016-06-22 14:35:19 +02:00
Thomas Karl Pietrowski
4bc5883ad7 SliceInfo: Check for available data before submitting it 
The code here is self-explaining again..
 2016-06-22 14:30:20 +02:00
fieldOfView
1c83b15290 Tweak viewport overlay 
Change color, opacity. Block mouseclicks.
CURA-1036
 2016-06-22 14:22:35 +02:00
Thomas Karl Pietrowski
f1ac2405a7 Merge branch 'master-CURA-1615' of https://github.com/thopiekar/Cura.git into master-CURA-1445 2016-06-22 14:02:41 +02:00
Thomas Karl Pietrowski
1dc29fb984 SliceInfo: Correctly output the print time 2016-06-22 14:02:11 +02:00
Thomas Karl Pietrowski
e78bd92b7f SliceInfo: Adding all containers as serialized data 2016-06-22 14:01:23 +02:00
Tim Kuipers
b22d65c369 Merge branch 'master' into feature_zhop_over_other_material 2016-06-22 13:25:50 +02:00
Jaime van Kessel
dcafb7d83a Removed Execute, as it's no longer used 
CURA-1385
 2016-06-22 13:10:10 +02:00