3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
3304 commits 313 branches 275 tags 718 MiB
Commit graph

3304 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jaime van Kessel
6f6d70ad0f Added upgradeFirmware as machineAction 
CURA-1385
 2016-06-21 17:00:26 +02:00
fieldOfView
8a206b74fd Use new-style signalemitter decorator instead of SingalEmitter subclass 
CURA-1615
 2016-06-21 16:24:07 +02:00
Jaime van Kessel
fb1313ceda BedLevel action now resets once it did all the steps 
CURA-1385
 2016-06-21 16:23:31 +02:00
Jaime van Kessel
671a6105a2 Setting a action to finished also causes it to be reset 
CURA-1385
 2016-06-21 16:22:54 +02:00
Jaime van Kessel
65751d7400 Added completed signal to machine action, so model can notify display that it is completed 
CURA-1385
 2016-06-21 16:19:44 +02:00
Jaime van Kessel
181d16aad8 Running machine actions outside of first run is now possible 
CURA-1385
 2016-06-21 14:34:53 +02:00
Jaime van Kessel
924af37dff Fleshing out of bedleveling action 
CURA-1385
 2016-06-21 13:30:36 +02:00
Ghostkeeper
63edd6f74d
Improve default raft settings 
Results from materials testing.
 2016-06-21 12:57:33 +02:00
Jaime van Kessel
81602e9ccd Machine action can now create displayItems 
CURA-1385
 2016-06-21 12:47:34 +02:00
Jaime van Kessel
3342f2a76a Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-20 13:52:11 +02:00
Jaime van Kessel
8af2b076a7 Added plugin for UM machine actions 
CURA-1385
 2016-06-20 13:51:27 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages 
CURA-1385
 2016-06-20 13:46:05 +02:00
Ghostkeeper
f139e91f88
Remove minimum and maximum of _extruder_nr settings 
This way the validation won't get an error any more. There is no validation. It's an enum anyway.

Contributes to issue CURA-1716.
 2016-06-20 12:00:56 +02:00
Jaime van Kessel
83c1ee8082 Required/supported/first run actions are now added to the manager 
CURA-1385
 2016-06-20 10:52:18 +02:00
Jaime van Kessel
6f7affa2bf Machine actions can now be triggered from QML 
CURA-1385
 2016-06-17 17:22:49 +02:00
Tim Kuipers
db3d568c76 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-17 16:31:22 +02:00
Jaime van Kessel
af3e4e3a15 Machine actions can now be used as a plugin type for Cura 
CURA-1385
 2016-06-17 15:45:10 +02:00
Jaime van Kessel
4beec2982e Fixed typo 
CURA-1385
 2016-06-17 15:23:15 +02:00
Jaime van Kessel
78a0c623ef Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-17 14:59:16 +02:00
Tim Kuipers
2e9ee9f668 JSON lil fix: default didn't coicide with default inherited state 2016-06-17 11:36:50 +02:00
fieldOfView
68a737129e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 15:09:07 +02:00
fieldOfView
0893e4b2cc Revert "Fix variant vs nozzle" 
This reverts commit cb05f75f6a.
 2016-06-16 15:08:45 +02:00
fieldOfView
666b1a0263 Revert "Fix check for has_variants & has_materials" 
This reverts commit 7f093be75a.
 2016-06-16 15:08:20 +02:00
fieldOfView
a5424fa207 Revert "Fix filtering of variants and materials by definition instead of by machine" 
This reverts commit 623b8f276e.
 2016-06-16 15:08:05 +02:00
Ghostkeeper
60d6cc07fb
Add Mendel90 by Bo Herrmannsen 
Provided via https://github.com/Ultimaker/Cura/issues/808
 2016-06-16 13:17:41 +02:00
fieldOfView
f2819cb9b0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 12:47:23 +02:00
fieldOfView
623b8f276e Fix filtering of variants and materials by definition instead of by machine 
CURA-333
 2016-06-16 12:47:08 +02:00
Ghostkeeper
e308c69c54 Merge pull request #804 from thopiekar/master-eclipse-markers 
Adding a marker for a correctly unresolved import on Linux and OSX
 2016-06-16 11:07:27 +02:00
fieldOfView
7f093be75a 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-16 10:41:50 +02:00
fieldOfView
631ab9c0a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-16 10:14:49 +02:00
fieldOfView
cb05f75f6a Fix variant vs nozzle 
CURA-333
 2016-06-16 10:14:17 +02:00
Simon Edwards
98f9b4f9a0 Minor codestyle/naming fix. 
Contributes to CURA-1667 Profile import/export
 2016-06-16 09:15:34 +02:00
Aldo Hoeben
3d53bc38b7 Merge pull request #803 from thopiekar/master-CURA-1615 
[CURA-1615] Updating firmware manager for API 3
 2016-06-15 17:49:20 +02:00
Thomas Karl Pietrowski
7ef64cd05b Return an empty string just to be sure 2016-06-15 17:43:28 +02:00
Thomas Karl Pietrowski
6b41608db2 Correcting the last comment.. 2016-06-15 17:33:52 +02:00
Thomas Karl Pietrowski
51222325b0 Last cleanup 
Removing useless comments and replacing the log message with something
more simple.
 2016-06-15 17:29:49 +02:00
Simon Edwards
d74cecd9db Set the ID of the profile object during import; ensure it is unique. 
Contributes to CURA-1667 Profile import/export
 2016-06-15 16:27:40 +02:00
Thomas Karl Pietrowski
38eec41162 Merge pull request #805 from thopiekar/master-using-platform 
Differencing between Platform from UM.* and UM.Scene.*
 2016-06-15 16:04:32 +02:00
Thomas Karl Pietrowski
6a89062b0a Differencing between Platform from UM.* and UM.Scene.* 2016-06-15 16:03:18 +02:00
Thomas Karl Pietrowski
77961e83c2 Adding a marker for a correctly unresolved import on Linux and OSX 2016-06-15 15:05:36 +02:00
Thomas Karl Pietrowski
3c4d09464d Merge pull request #790 from thopiekar/master-using-platform 
[master] Using UM.Platform for OS detection
 2016-06-15 15:00:21 +02:00
Thomas Karl Pietrowski
536e0f489a Merge branch 'master' of https://github.com/Ultimaker/Cura into master-using-platform 2016-06-15 14:59:34 +02:00
Thomas Karl Pietrowski
2e7db9b732 Adding check whether getGlobalContainerStack() returns None or not. 
If we get None here, the firmware-updater will be closed and detailed
error returned to the logs with an explanation why.
 2016-06-15 14:38:23 +02:00
Ghostkeeper
7c2c24b8a5
Remove unused function 
Contributes to issue CURA-340.
 2016-06-15 14:38:19 +02:00
Ghostkeeper
cb467f488b
Don't convert ids to lowercase 
Eventually we might have to do this due to case-insensitivity of some file systems, but this is not the place for that anyway.

Contributes to issue CURA-340.
 2016-06-15 14:36:58 +02:00
Jaime van Kessel
8b5800c1ee Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-15 14:14:19 +02:00