3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
3596 commits 305 branches 270 tags 779 MiB
Commit graph

3596 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jaime van Kessel
e1828a7689 Removed stray debug print 
CURA-1385
 2016-06-22 12:59:35 +02:00
Jaime van Kessel
4ad7731efd Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-22 12:45:29 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled 
CURA-1385
 2016-06-22 11:49:35 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency" 
This reverts commit 963a2092ef.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
 2016-06-22 10:19:44 +02:00
fieldOfView
b17d621243 Disable nozzle/material selection on the global tab 
The global tab has no nozzle/material by definition.
CURA-333
 2016-06-22 09:55:25 +02:00
fieldOfView
6fa1fb9d2f Select "Global" tab when switching to a machine that has multiple extruders. 
CURA-333
 2016-06-22 09:55:24 +02:00
fieldOfView
3fcfbb4e48 Fix extruder color when no extruder_nr has been added to an object 
CURA-345
 2016-06-22 09:55:24 +02:00
fieldOfView
963a2092ef Change spelling of "colour" to "color" for consistency 
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.

CURA-333
 2016-06-22 09:55:23 +02:00
fieldOfView
f5bdc0295c Use color specified by material or nozzle to render objects 
CURA-345
 2016-06-22 09:55:23 +02:00
fieldOfView
5d8a9a2cda Keep the same material and quality when switching nozzle or material 
CURA-333
 2016-06-22 09:55:22 +02:00
fieldOfView
92905ada34 Show true extrudernames in Simple Mode support extruder selection combobox 
CURA-333
 2016-06-22 09:55:21 +02:00
fieldOfView
eba2451cf2 Add tooltip to extruder-tabs 
CURA-333
 2016-06-22 09:55:21 +02:00
fieldOfView
68ee4f0ea1 Format extrudername to include material name 
CURA-333
 2016-06-22 09:55:20 +02:00
fieldOfView
f083d41353 Update extrudermodel when material is changed 
So the swatch updates, and we can use the materialname for extruder selection later on

CURA-333
 2016-06-22 09:55:20 +02:00
fieldOfView
d0626f8c8a Add hypothetical multiextrusion printer to test 2016-06-22 09:55:19 +02:00
fieldOfView
825fcc2020 Fix filtering of variants and materials by definition instead of by machine 
CURA-333
 2016-06-22 09:55:18 +02:00
fieldOfView
ee7cfe273e Fix check for has_variants & has_materials 
These are defined as bool values instead of strings in UM2+ definitions, so I would expect other machine definitions (including jedi) also use bools.

CURA-333
 2016-06-22 09:55:18 +02:00
fieldOfView
bd703e65af Fix variant vs nozzle 
CURA-333
 2016-06-22 09:55:17 +02:00