8024 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
Ghostkeeper	c52649a91f	Merge branch 'patch-3' of https://github.com/probonopd/Cura into probonopd-patch-3	2017-03-15 09:13:33 +01:00
Jack Ha	132b6aa9d7	Merge branch '2.5'	2017-03-15 09:10:49 +01:00
probonopd	9dbb7fcc15	Update as per discussion in https://github.com/Ultimaker/Cura/pull/1350	2017-03-14 18:31:58 +01:00
Ghostkeeper	e443993ff2	Fix finding Python and Uranium ... Otherwise all tests fail that require UM.	2017-03-14 17:25:31 +01:00
Arjen Hiemstra	1d008bdfc2	Allow empty JUnit results so a test failure does not become a build fail	2017-03-14 17:15:18 +01:00
Arjen Hiemstra	6a28368beb	Add a Jenkinsfile so Cura will be tested on CI	2017-03-14 17:00:22 +01:00
jack	284e620da2	Merge pull request #1531 from Ultimaker/feature_version_upgrade_2.5 ... Version Upgrade 2.4 to 2.5	2017-03-14 16:05:43 +01:00
jack	056c9dd362	Merge pull request #1532 from Ultimaker/feature_version_upgrade_2.5_tests ... Version Upgrade 2.4 to 2.5 tests	2017-03-14 16:05:36 +01:00
Jack Ha	50c978a05b	Fixed cura tests.	2017-03-14 16:05:09 +01:00
MaukCC	35c0f3ca74	Update cartesio.def.json	2017-03-14 15:05:20 +01:00
MaukCC	37d7cd989b	Create draft.inst.cfg	2017-03-14 15:03:52 +01:00
MaukCC	4620187fdc	Update extra_coarse.inst.cfg	2017-03-14 15:03:05 +01:00
MaukCC	de2fd03057	Update coarse.inst.cfg	2017-03-14 15:02:49 +01:00
MaukCC	5428a29a28	Update cartesio.def.json	2017-03-14 14:44:56 +01:00
MaukCC	7acf26ebe7	Update normal.inst.cfg	2017-03-14 14:29:11 +01:00
MaukCC	3698e2fca6	Update low.inst.cfg	2017-03-14 14:28:57 +01:00
MaukCC	880f47044d	Update high.inst.cfg	2017-03-14 14:28:38 +01:00
MaukCC	f7b495ce2a	Update extra_coarse.inst.cfg	2017-03-14 14:28:22 +01:00
MaukCC	8b7d66608a	Update coarse.inst.cfg	2017-03-14 14:28:09 +01:00
MaukCC	4c5e0614d8	Update coarse.inst.cfg	2017-03-14 14:00:58 +01:00
MaukCC	7ad6356256	Update extra_coarse.inst.cfg	2017-03-14 14:00:38 +01:00