Commit graph

6996 commits

Author SHA1 Message Date
Jaime van Kessel
bbcd43ef01 Reset all translations now ensures that model is right on top of buildplate
CURA-2233
2016-09-02 14:23:05 +02:00
Jaime van Kessel
aa83b6834b Removed unused decorator 2016-09-02 13:43:28 +02:00
Jaime van Kessel
069bbde84a Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-02 13:33:33 +02:00
Jaime van Kessel
405d3d920a Prime tower can no longer be printed outside build volume
Note that it doesn't take disallowed area's into account
CURA-2234
2016-09-02 13:31:29 +02:00
fieldOfView
d610a30ccb Fix overhang display if the overhang angle is set to its default value 2016-09-02 13:17:31 +02:00
Jaime van Kessel
6c9b04182c Minor text change in changelog
CURA-2218
2016-09-02 13:06:10 +02:00
Jaime van Kessel
73b9a142d2 Auto generate name now works if base_name is empty string
CURA-2220
2016-09-02 11:42:14 +02:00
Jaime van Kessel
1a78aee46c fix typo 2016-09-02 11:37:54 +02:00
Jaime van Kessel
266f46ed55 Rename dialog shows again when creating new profile from current settings
CURA-2220
2016-09-02 11:37:06 +02:00
Jaime van Kessel
e5aa7ff18a Rename dialog shows again when creating new profile from current settings
CURA-2220
2016-09-02 11:30:50 +02:00
Thomas Karl Pietrowski
cd9e049895 CMake: Skip looking for C/C++ compiler 2016-09-02 11:12:28 +02:00
Jaime van Kessel
3df1eb00da Added some extra checks when changing quality profiles
Contributes to ultimaker/cura#960
2016-09-02 10:56:27 +02:00
Jaime van Kessel
d7d1804319 Added correct exception handling for .curaprofile importing
CURA-2252
2016-09-02 10:16:11 +02:00
Jaime van Kessel
6c6ced4048 Undo changes made for debugging 2016-09-02 10:10:54 +02:00
Jaime van Kessel
7451e9d6ae Removed auto-temp from changelog
We didn't actually finish it, so it shouldn't be in changelog
2016-09-02 09:19:55 +02:00
Jaime van Kessel
c65e79a5db Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-01 16:52:13 +02:00
Jaime van Kessel
697329f5d2 Fixed review issues
CURA-2108
2016-09-01 16:43:40 +02:00
fieldOfView
478c4b758e Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-01 16:23:20 +02:00
fieldOfView
a2d74cc984 Fix documentation 2016-09-01 16:23:06 +02:00
Thomas Karl Pietrowski
1699cd741f CMake: Skip looking for C/C++ compiler 2016-09-01 15:57:44 +02:00
Jaime van Kessel
8dc1011b67 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-01 15:42:29 +02:00
Jaime van Kessel
3f5d7b0f53 One at a time mode now adds platform adhesion to convex hulls
CURA-403
2016-09-01 15:42:00 +02:00
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