GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-14 01:28:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,972 Commits 290 Branches 260 Tags
Commit Graph

2972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
d810c7ddbb
Properly reload extruders at the start 
The extruder manager was too late to catch the initial global stack switch and machine switch. Now it just always reloads the extruders at the beginning.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-05 16:17:55 +02:00
fieldOfView
9aa8ca3292 Fix uninitialised variable 
CURA-1619
 2016-06-05 16:03:31 +02:00
fieldOfView
c21475abd7 Prevent multiple machines having the same custom name 
Caused by container vs containerstack confusion
Fixes CURA-1606 and CURA-1649
 2016-06-05 14:05:56 +02:00
fieldOfView
ead91db062 Fix activating another container stack when the currently active stack is removed 
CURA-1632
 2016-06-05 13:54:55 +02:00
Jaime van Kessel
cb742cf7ce Fixed saving of machines again 2016-06-05 12:53:41 +02:00
Jaime van Kessel
8b294fbe97 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-05 12:45:29 +02:00
Jaime van Kessel
b63c308694 Changed order of loading containers so extruder stacks don't fail anymore 
CURA-340
 2016-06-05 12:45:02 +02:00
fieldOfView
a52cd9f2ef Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-05 12:22:37 +02:00
fieldOfView
d13b5adda6 Codestyle & comments 
CURA-1619
 2016-06-05 12:22:23 +02:00
Jaime van Kessel
783134031b Settings can now be set by extruder 
CURA-340
 2016-06-05 12:17:35 +02:00
Jaime van Kessel
64ded3299e Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-05 12:02:10 +02:00
Jaime van Kessel
1e44abb9be Added activeExtruder stack to machineManager model 
CURA-340
 2016-06-05 12:01:46 +02:00
Jaime van Kessel
eeb1882c2f Merge pull request #765 from thopiekar/master-buildtype-in-splashscreen 
Fixing a typo
 2016-06-05 11:38:20 +02:00
Jaime van Kessel
c79b7bdd7a Machine manager now creates ExtruderTrainStacks 
CURA-340
 2016-06-05 11:34:29 +02:00
Thomas Karl Pietrowski
d6acb78bd4 Fixing a typo 
Had that change locally here, but for a reason I forgot to commit that
fix. Oops..
 2016-06-05 09:59:57 +01:00
Jaime van Kessel
2f3352bfa0 Added default values when adding variant & materials 
CURA-1612
 2016-06-05 10:45:47 +02:00
Jaime van Kessel
0e09d4a349 Merge branch 'thopiekar-master-buildtype-in-splashscreen' 2016-06-05 10:28:51 +02:00
Jaime van Kessel
cb0df43f4b Merge branch 'master-buildtype-in-splashscreen' of git://github.com/thopiekar/Cura into thopiekar-master-buildtype-in-splashscreen 2016-06-05 10:28:33 +02:00
Arjen Hiemstra
0a9382aa11 Fix exclusiveGroup for machine selection in the menu 
Contributes to CURA-1278
 2016-06-04 21:22:21 +02:00
Arjen Hiemstra
2d77ddada4 Add ABS/CPE quality profiles for UM2(E)+ 
Contributes to CURA-1612
 2016-06-04 21:21:57 +02:00
Arjen Hiemstra
312097c523 Specify UMO as having materials 
Contributes to CURA-1612
 2016-06-04 21:21:24 +02:00
Arjen Hiemstra
e0ebe960ac Update standard quality profiles 
Contributes to CURA-1612
 2016-06-04 21:19:29 +02:00
Arjen Hiemstra
65a563027d Specify preferred material/quality as wildcards 
This way it becomes a lot simpler to match them

Contributes to CURA-1612
 2016-06-04 21:19:05 +02:00
Arjen Hiemstra
3413334c6d Update active material/quality when changing one of the lower levels 
Contributes to CURA-1612
 2016-06-04 21:17:27 +02:00
Arjen Hiemstra
3a3314aad1 Remove all old profiles 
Contributes to CURA-1612
 2016-06-04 21:16:39 +02:00
Arjen Hiemstra
8f21ec3980 Add PLA profiles for UM2Extended+ 
Contributes to CURA-1612
 2016-06-04 20:51:53 +02:00
Arjen Hiemstra
6a3b321e5a Re-enable commented code 2016-06-04 19:23:46 +02:00
Arjen Hiemstra
b33ce573c1 Also filter materials and profiles preference pages by machine etc. when desired 
Contriubtes to CURA-1612
 2016-06-04 19:22:42 +02:00
Arjen Hiemstra
a81cab5eac Merge branch '2.1' 2016-06-04 19:11:59 +02:00
Thomas Karl Pietrowski
c62ab6e937 Adding a field of the build type to the spashscreen. 
For example, if the community distributes Cura in a different way, they
can set CURA_BUILDTYPE via 'cmake -DCURA_BUILDTYPE=' and whenever Cura
is launched " (PPA)" will be appended. Of course, this could be done by
appending " (PPA)" to CURA_VERSION, but in case of my Ubuntu/Debian
packaging it will only need one modification in debian/changelog to
change the version. During build (debian/rules) this version will be
read from debian/changelog.
Changing the version number across different files, is a waste of time.

Finally, we can use that field in the future to indicate debug or other
other special builds.
 2016-06-04 13:55:35 +02:00
Jaime van Kessel
490a8724e5 Fixed duplication of profiles 
CURA-1427
 2016-06-03 16:29:46 +02:00
Jaime van Kessel
fdbd6d7c5f Updating profile now also works in profile page 
CURA-1585
 2016-06-03 15:29:41 +02:00
Jaime van Kessel
d1d60e27cc Added function to duplicate container 
CURA-1427
 2016-06-03 15:25:08 +02:00
Jaime van Kessel
01999f7ddd Custom profiles can now be renamed 2016-06-03 15:00:09 +02:00
Jaime van Kessel
80f24b6c54 Removed ulti quality, as that got in 2.1 by mistake 
As it got in there by mistake, it has no place here either!
 2016-06-03 14:56:42 +02:00
Jaime van Kessel
cd8df44812 Changed multiple properties in profile page to new API 
CURA-1285
 2016-06-03 14:40:28 +02:00
Jaime van Kessel
ea73f00aac Fixed case where validation state was set incorrectly 
CURA-1585
 2016-06-03 14:39:36 +02:00
Jaime van Kessel
b6b154e153 Fixed slowdown caused by validation check 
CURA-1585
 2016-06-03 13:34:06 +02:00
Jaime van Kessel
2b91b81f2d Added documentation 
CURA-1585
 2016-06-03 13:24:23 +02:00
Jaime van Kessel
5faf2f024f Added signal for validation state 
This improves the runtime speed somewhat
CURA-1585
 2016-06-03 13:14:49 +02:00
Jaime van Kessel
7b87143e65 Only value property events are now used 
This speeds the num events up a bit, but it's still a tad to slow

CURA-1585
 2016-06-03 13:07:35 +02:00
Jaime van Kessel
0dece95f0f Updating non-readonly profiles is now possible again 
CURA-1585
 2016-06-03 13:03:56 +02:00
Jaime van Kessel
d29cc37d6b Adds way to convert user settings into quality settings 
CURA-1585
 2016-06-03 11:58:59 +02:00
Jaime van Kessel
4fc565711d Added read-only property to profiles 
CURA-1585
 2016-06-03 11:19:33 +02:00
Jaime van Kessel
113da81db5 Added isValidGlobalStack property to MachineManager 
CURA-1585
 2016-06-03 10:29:19 +02:00
Jaime van Kessel
171adde6be Fixed broken signal when file was loaded 2016-06-03 10:15:01 +02:00
Jaime van Kessel
3d47e3528a Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-03 10:06:41 +02:00
Jaime van Kessel
ad35c9f070 Added reload profile (simply clears user instance container) 
CURA-1278
 2016-06-03 10:06:08 +02:00
fieldOfView
d7148844ac Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-02 17:44:29 +02:00
fieldOfView
0dec0aafcf Fix exception when loading an object 
CURA-1619
 2016-06-02 17:44:06 +02:00