3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
7424 commits 306 branches 270 tags 779 MiB
Commit graph

7424 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
7d8b3dfa51 One at a time now uses correct shapes to push free again 
CURA-403
 2016-09-01 15:41:23 +02:00
fieldOfView
cf09a74db3 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-01 15:39:37 +02:00
fieldOfView
7961104a0c Disable material/variant combinations we have no profile for 
CURA-2236
 2016-09-01 15:39:24 +02:00
fieldOfView
fa8eba7873 Update wording 2016-09-01 15:14:53 +02:00
Jaime van Kessel
392e3a4385 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-01 14:45:00 +02:00
Jaime van Kessel
a68e112060 Fixed resolvement not being overwritten by user changes 2016-09-01 14:44:29 +02:00
fieldOfView
85fc680994 Merge branch '2.3' 2016-09-01 14:18:13 +02:00
Simon Edwards
a2f478f2ad Fix for "Creating two profiles causes the names to become messed up" 
CURA-2220
 2016-09-01 13:49:29 +02:00
fieldOfView
aa689dc2fb Fix layerview for grouped objects 
The "ghosts" would be rendered over grouped objects, thereby making them not visible. Note that this quick fix comes at the price of slightly "muddying" all the layerview colors. A better fix was proposed here (but it is not yet working correctly): https://github.com/Ultimaker/Cura/pull/906

CURA-2246
 2016-09-01 13:34:18 +02:00
fieldOfView
73d7e22efe Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-01 13:04:09 +02:00
fieldOfView
fa3464901e Only show prime tower disabled area when the prime tower is enabled 
CURA-2152
 2016-09-01 13:03:50 +02:00
Jaime van Kessel
9d6c60ec60 Setting state is now set to calculated after setting the value 
This ensures that the setting of the value does not overide the state

CURA-2221
 2016-09-01 13:00:54 +02:00
Barry Stump
d8c7b325f0 update Printrbot Simple definition 
* Add platform mesh
* Default nozzle size is 0.4mm
* Updated start gcode to correct bed origin after auto-level
 2016-09-01 11:33:23 +02:00
Jaime van Kessel
7145054f8c Merge pull request #958 from weevilgenius/update-printrbot-simple 
update Printrbot Simple definition
 2016-09-01 11:32:40 +02:00
Jaime van Kessel
34324586c2 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-01 11:26:34 +02:00
Jaime van Kessel
bef410b4a3 Machines are now flattened before merging them 
This ensures that machines are overwritten correctly

CURA-2108
 2016-09-01 11:26:13 +02:00
Jaime van Kessel
bacac1e42e 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-09-01 11:25:52 +02:00
Jack Ha
e9d9597caa Commented out duplicate and import, on OS X 'visible' does not work 2016-09-01 11:22:38 +02:00
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