Jaime van Kessel
|
cb1a36577c
|
Machines are now flattened before merging them
This ensures that machines are overwritten correctly
CURA-2108
|
2016-09-01 11:18:15 +02:00 |
|
Barry Stump
|
28cc10edaf
|
update Printrbot Simple definition
* Add platform mesh
* Default nozzle size is 0.4mm
* Updated start gcode to correct bed origin after auto-level
|
2016-08-31 14:58:46 -07:00 |
|
Jaime van Kessel
|
ad22cf4861
|
XML material profile merging is now far less naive.
It's still a work in progress, as it doesn't succeed in all cases just yet.
CURA-2108
|
2016-08-31 17:18:33 +02:00 |
|
Jaime van Kessel
|
1fda24c43f
|
Removed dead code
CURA-2108
|
2016-08-31 15:09:04 +02:00 |
|
Jaime van Kessel
|
389cea2fcc
|
Merge branch 'duplicate-material' of github.com:Ultimaker/Cura
|
2016-08-31 14:57:11 +02:00 |
|
Jaime van Kessel
|
6ff258d7e0
|
Single extrusion machines now show correct values for profiles in tab
CURA-2214
|
2016-08-31 14:52:41 +02:00 |
|
jack
|
2db8e5c166
|
Changelog: typo
|
2016-08-31 12:53:46 +02:00 |
|
Jack Ha
|
c10f04d638
|
Typo in changelog
|
2016-08-31 12:53:14 +02:00 |
|
Jack Ha
|
57f13869e6
|
For the beta release, removed duplicate and import material.
|
2016-08-31 12:47:21 +02:00 |
|
Jaime van Kessel
|
2c8b9290f8
|
Made checking if inheritance is allowed more explicit
CURA-2108
|
2016-08-31 11:41:33 +02:00 |
|
Jaime van Kessel
|
32b9d20647
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2016-08-31 09:32:12 +02:00 |
|
Jaime van Kessel
|
a1e315ef95
|
Updated changelog
CURA-2000
|
2016-08-31 09:31:19 +02:00 |
|
fieldOfView
|
873b4f7232
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2016-08-31 00:03:55 +02:00 |
|
fieldOfView
|
25fb4d0b27
|
Show generic materials by display name instead of by material
|
2016-08-30 18:39:02 +02:00 |
|
fieldOfView
|
42010e34d2
|
Show material by its displayname instead of its color
|
2016-08-30 18:30:45 +02:00 |
|
jack
|
3ead74ea17
|
Merge pull request #957 from Ultimaker/feature_layerview_ghosts2
Show "ghosts" for all objects on the buildplate in layerview
|
2016-08-30 17:06:35 +02:00 |
|
fieldOfView
|
82f6f20bc1
|
Restore profiles overview for single extrusion printers
CURA-2214
|
2016-08-30 16:42:41 +02:00 |
|
fieldOfView
|
5cd3cfca45
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2016-08-30 16:26:33 +02:00 |
|
fieldOfView
|
f7f4aa7659
|
Activate another profile when the user cancel out of generating a new profile
CURA-2220
|
2016-08-30 16:26:21 +02:00 |
|
Jaime van Kessel
|
fbbbdb61e3
|
Merge branch 'feature_material_inheritance' of github.com:Ultimaker/Cura
|
2016-08-30 16:05:10 +02:00 |
|
Jaime van Kessel
|
1940d45971
|
Added way to acces inherited files
CURA-2108
|
2016-08-30 16:04:05 +02:00 |
|
fieldOfView
|
cb7a3de757
|
Code style
|
2016-08-30 16:02:08 +02:00 |
|
Jaime van Kessel
|
dcbf7b5a35
|
When unable to find quality for material, we also use inherited files (if any) to resolve it
CURA-2108
|
2016-08-30 16:01:21 +02:00 |
|
fieldOfView
|
ac7c1a92a5
|
Show "Create" only when there are user changes, "Duplicate" otherwise
CURA-2220
|
2016-08-30 15:58:16 +02:00 |
|
fieldOfView
|
b09e8bb1c9
|
Use active quality(-changes) name when creating a new profile
CURA-2220
|
2016-08-30 15:56:53 +02:00 |
|
Jaime van Kessel
|
0a811b2164
|
Added more logging to changing of containers
CURA-2108
|
2016-08-30 15:42:37 +02:00 |
|
fieldOfView
|
e79694178c
|
Update for readability
CURA-2214
|
2016-08-30 15:11:50 +02:00 |
|
Jaime van Kessel
|
7a54f21633
|
Added inherited_files property
|
2016-08-30 14:51:27 +02:00 |
|
Jaime van Kessel
|
6a2e5ffe77
|
Added inheritance support to XML material profile deserialization
CURA-2108
|
2016-08-30 14:48:34 +02:00 |
|
fieldOfView
|
b004c53c6d
|
Fix upadting list of materials when switching printers
CURA-2209
|
2016-08-30 14:42:43 +02:00 |
|
fieldOfView
|
a8d8a8a7ed
|
CodeStyle
|
2016-08-30 14:09:16 +02:00 |
|
fieldOfView
|
4593e8615e
|
Fix hiding extruder selection when switching to a signle extrusion printer
CURA-2207
|
2016-08-30 14:08:29 +02:00 |
|
fieldOfView
|
7aa44bdd9e
|
Remove commented out code
|
2016-08-30 13:38:08 +02:00 |
|
fieldOfView
|
b0d0d81dc3
|
Revert "Render ghost behind all objects in layerview"
I did not mean to merge this yet.
This reverts commit 18e1fc59da.
|
2016-08-30 13:32:33 +02:00 |
|
fieldOfView
|
46ee6c0713
|
Show "ghosts" for all objects on the buildplate in layerview
Simpler implementation that works.
CURA-1601
|
2016-08-30 13:27:19 +02:00 |
|
fieldOfView
|
18e1fc59da
|
Render ghost behind all objects in layerview
CURA-1601
|
2016-08-30 13:21:58 +02:00 |
|
Jaime van Kessel
|
91c11ee0fc
|
Merge branch 'feature_listmodel_setitems' of github.com:Ultimaker/Cura
|
2016-08-30 11:08:57 +02:00 |
|
Jaime van Kessel
|
4c61c66a4b
|
Changing profiles now also forces defocus of setting fields
CURA-2180
|
2016-08-30 11:02:33 +02:00 |
|
Jaime van Kessel
|
f85f7cb62c
|
Filter certain settings based on stack type in profile tab
CURA-2214
|
2016-08-30 10:47:32 +02:00 |
|
Jaime van Kessel
|
821c915ce6
|
Imported profiles are now directly set as dirty so they are saved to storage upon exit
CURA-2099
|
2016-08-30 09:49:07 +02:00 |
|
Jaime van Kessel
|
d711a510dd
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2016-08-29 16:50:42 +02:00 |
|
Jaime van Kessel
|
432377a075
|
Per object setting now defaults to first extruder instead of active
CURA-2189
|
2016-08-29 16:47:32 +02:00 |
|
Jack Ha
|
191a318df6
|
ContainerRegistry only getInstance once.
|
2016-08-29 16:44:37 +02:00 |
|
Jaime van Kessel
|
cf2cfa3c45
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2016-08-29 16:36:48 +02:00 |
|
Jaime van Kessel
|
1ef24c9e9d
|
CHanged function called by bedlevel action qml
CURA-2199
|
2016-08-29 16:35:39 +02:00 |
|
fieldOfView
|
00250acb10
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2016-08-29 16:35:32 +02:00 |
|
fieldOfView
|
6c16d82736
|
Add material type as a column in the Material manager
...and a color swatch for good measure.
|
2016-08-29 16:35:10 +02:00 |
|
Jaime van Kessel
|
70af60c5fb
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2016-08-29 16:18:46 +02:00 |
|
Jaime van Kessel
|
9a753680e7
|
Setting pane now uses correct profiles to display setting values
CURA-2185
|
2016-08-29 16:18:15 +02:00 |
|
fieldOfView
|
8db0646266
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2016-08-29 15:35:31 +02:00 |
|