9400 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	d52515d57d	Added invert zoom preference option	2017-03-16 19:06:57 +01:00
Jack Ha	7604ae62f3	Merge branch '2.5'	2017-03-16 16:04:59 +01:00
Jack Ha	7d62a699fb	Capitalize Not Supported. CURA-3390	2017-03-16 16:04:47 +01:00
Jack Ha	ff77571300	Merge branch '2.5'	2017-03-16 16:01:33 +01:00
Jack Ha	aa691033e0	Added Not Supported profiles for incompatible materials. CURA-3510	2017-03-16 16:01:18 +01:00
Jack Ha	6194ffa27b	Removed comment. CURA-3390	2017-03-16 15:28:57 +01:00
Jack Ha	60c5112824	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-16 15:27:55 +01:00
Jack Ha	9b06983f3e	GCode reader: Better layerheight guess, refactoring, more robust, take extruder offset into account of multi extrusion. CURA-3390	2017-03-16 15:27:48 +01:00
Jaime van Kessel	f736e74f77	Moved setting of color for convex hull to constructor ... This should result in less color changes so should make it slightly faster CURA-3419	2017-03-16 15:08:06 +01:00
Jaime van Kessel	36b5c369cf	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-16 13:44:26 +01:00
Jaime van Kessel	de02d331c7	Selection tool operation stoped no longer triggers platform physics ... CURA-3465	2017-03-16 13:42:29 +01:00
Lipu Fei	e00c68344a	CURA-3495 open project/models in one dialog	2017-03-16 13:37:06 +01:00
Lipu Fei	b35a97c770	CURA-3495 preRead() takes flexible arguments	2017-03-16 13:37:06 +01:00
Lipu Fei	ea16f967d7	Fix code styling	2017-03-16 13:37:06 +01:00
Jaime van Kessel	a7b5879263	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-16 13:18:41 +01:00
Jaime van Kessel	efce0696bd	Recently activated material can no longer be removed ... CURA-3147	2017-03-16 13:11:51 +01:00
Tim Kuipers	36420070fa	JSOn fix: more description on support_bottom_stair_step_height (CURA-3380)	2017-03-16 13:02:50 +01:00
Jaime van Kessel	134425db90	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-16 11:27:54 +01:00
Jaime van Kessel	36bcd90e08	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-16 11:27:10 +01:00
Jaime van Kessel	a170624ff1	Disabled the 2.5 upgrader	2017-03-16 11:26:50 +01:00
Jaime van Kessel	1f734d5245	Disabled the start_layers_at_same_position setting	2017-03-16 11:21:08 +01:00
Jaime van Kessel	6da6ae1b9e	start_x and start_y are now settable per extruder	2017-03-16 11:19:44 +01:00
Jaime van Kessel	5bcfba0f17	Revert "removal: remove start_layers_at_same_position; it is now mandatory to start each layer near the given position (CURA-3339)" ... This reverts commit 1482c27b21.	2017-03-16 11:16:55 +01:00
Jaime van Kessel	ad7752bb16	Revert "Updated version of superdraft and verydraft. CURA-3479" ... This reverts commit 62de4f9ec6.	2017-03-16 11:16:02 +01:00
Jaime van Kessel	0c1829af1e	Revert "Upgrade built-in instance containers" ... This reverts commit b162be4df8.	2017-03-16 11:15:20 +01:00
Tim Kuipers	9302f4e9c6	JSON feat: support_bottom_stair_step_width (CURA-3380)	2017-03-16 11:14:53 +01:00
Jack Ha	260c6e983e	Fix passing PYTHONPATH to pytest on Windows	2017-03-16 10:51:53 +01:00
Arjen Hiemstra	0c215331ee	PYTHONPATH uses a platform dependent path separator after all	2017-03-15 19:02:37 +01:00
Arjen Hiemstra	04548d2862	Add Uranium's cmake dir to CMAKE_MODULE_PATH ... This makes sure URANIUM_TRANSLATION_TOOLS can be found	2017-03-15 17:34:38 +01:00
Arjen Hiemstra	2620d7748e	Pass the right Uranium directory to CMake when running on CI	2017-03-15 17:24:19 +01:00
Arjen Hiemstra	04e517eddf	Do not hardcode the path to Uranium but use a cache variable ... This allows us to override the uranium dir and make sure it is still found even when it is not the same as "../uranium"	2017-03-15 17:23:54 +01:00
Tim Kuipers	999e59be66	fix: can now insert negative mold angle values (CURA-3512)	2017-03-15 16:21:42 +01:00
Tim Kuipers	09855bc21c	fix: 90 mold angle now possible (CURA-3512)	2017-03-15 15:12:08 +01:00
Jack Ha	1dbec70738	Merge branch '2.5'	2017-03-15 14:37:29 +01:00
Jack Ha	72f8a349cf	Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5	2017-03-15 14:37:13 +01:00
Jack Ha	6731d00ad7	Removed some lines from changelog.	2017-03-15 14:37:06 +01:00
Jack Ha	03d24db30d	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-15 14:30:11 +01:00
Jack Ha	f918a978b2	Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390	2017-03-15 14:29:59 +01:00
Jaime van Kessel	cb40ae45e8	Added contribution of the g-code plugin to the changelog ... CURA-3467	2017-03-15 14:23:09 +01:00
Jaime van Kessel	956e69873e	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-15 13:55:43 +01:00
Jack Ha	a647369735	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-15 13:17:12 +01:00
Jack Ha	bab1de604f	Less yields for G-code reader and faster. CURA-3390	2017-03-15 13:16:51 +01:00
Jack Ha	792332e2ec	Made G-code reader a lot faster. CURA-3390	2017-03-15 13:14:51 +01:00
Lipu Fei	18cf9e3172	CURA-3500 Make sure that material XMLs have utf-8 encoding	2017-03-15 11:47:33 +01:00
Jack Ha	fda00d4c9f	Added caution message for g-code reader. CURA-3390	2017-03-15 11:40:31 +01:00
Jaime van Kessel	e2045b2805	Starting Cura when no machines added but with a model no longer causes exceptions	2017-03-15 10:00:11 +01:00
Jaime van Kessel	6cc0bd893f	Save as now defaults to 3mf ... CURA-3496	2017-03-15 09:57:50 +01:00
Jaime van Kessel	48cba91b16	Merge branch 'master' of github.com:Ultimaker/Cura	2017-03-15 09:27:08 +01:00
Ghostkeeper	2564ac24f9	Merge branch 'probonopd-patch-3'	2017-03-15 09:26:12 +01:00
Jaime van Kessel	138c3db26f	Preferred mimetype is now used when saving to local or removable drive ... CURA-3496	2017-03-15 09:23:47 +01:00