22125 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wes Hanney	ce5ab0aa5f	Merge branch 'master' into master	2019-12-12 20:41:09 -06:00
Remco Burema	ef4ee5d6b6	Merge pull request #5335 from Hrybmo/master-1 ... PostProcessingPlugin Script for 2-1 Dual Extruders - ColorMix 2-1	2019-12-12 17:14:59 +01:00
Remco Burema	002aaacf0e	Merge branch 'master' into master-1	2019-12-12 17:10:24 +01:00
Remco Burema	7f1b1384e6	Merge pull request #6798 from Ultimaker/CURA-7012_manage_materials_third_party_printers ... [CURA-7012] Fix duplicated materials don't show for 3rd-party printers	2019-12-12 14:11:51 +01:00
Remco Burema	382d177a3b	Merge branch 'master' into CURA-7012_manage_materials_third_party_printers	2019-12-12 14:06:39 +01:00
Lipu Fei	e1e65b43b3	Remove gitlab-ci.yml	2019-12-12 14:06:23 +01:00
Ghostkeeper	c58edeb189	Merge branch 'mb-skin-edge-support' of https://github.com/smartavionics/Cura into smartavionics-mb-skin-edge-support	2019-12-12 09:03:17 +01:00
Jaime van Kessel	0f69c8d5f0	Merge branch 'CURA-7023_wrong_submaterial_container' of github.com:Ultimaker/Cura	2019-12-11 17:17:29 +01:00
Remco Burema	1415db7b76	Merge branch 'smartavionics-mb-skin-edge-support'	2019-12-11 17:02:36 +01:00
Remco Burema	2d486b0814	Default behaviour should be the same as previous. ... Also added the new setting to 'expert' visibility.	2019-12-11 17:00:02 +01:00
ninovanhooff	c910899ca7	Merge pull request #6606 from Ultimaker/pre_sliced_base_filename ... dont prepend 'Pre-sliced file'	2019-12-11 15:31:28 +01:00
Nino van Hooff	6725e28c07	Connect materialsChanged signal for printers without variants ... Fixes duplicated materials not showing up for third party printers CURA-7012	2019-12-11 11:55:25 +01:00
Lipu Fei	849ac3551d	Merge branch 'master' into master-1	2019-12-11 10:57:50 +01:00
Lipu Fei	4cc5baacf4	Merge branch 'master' into mb-skin-edge-support	2019-12-11 10:57:47 +01:00
Lipu Fei	0cb27774d6	Merge branch 'master' into pre_sliced_base_filename	2019-12-11 10:46:04 +01:00
Lipu Fei	77a297bfff	Merge branch 'master' into master	2019-12-11 10:45:26 +01:00
Lipu Fei	07df020d12	Merge branch 'master' into CURA-7023_wrong_submaterial_container	2019-12-11 10:45:22 +01:00
Lipu Fei	537424c058	Add GitHub Actions	2019-12-11 08:10:55 +01:00
Remco Burema	f0b277d491	Merge branch 'mb-skin-edge-support' of https://github.com/smartavionics/Cura into smartavionics-mb-skin-edge-support	2019-12-10 16:55:28 +01:00
Nino van Hooff	8aae5f7563	Fix: extra ConfigParsaer arg added to wrong call ... CURA-6522	2019-12-10 16:33:47 +01:00
Ghostkeeper	7f969528f3	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2019-12-10 16:03:02 +01:00
Ghostkeeper	ba2c9cb21e	Fix JSON formatting of start g-code ... No newlines allowed.	2019-12-10 16:02:45 +01:00
Ghostkeeper	455721130c	Merge branch 'master' of https://github.com/TheOneOgre/Cura into TheOneOgre-master	2019-12-10 15:57:57 +01:00
Nino van Hooff	38935a1d02	Fix selecting a new material for a base file on container deletion ... CURA-7023	2019-12-10 13:53:26 +01:00
Jaime van Kessel	b3430a1fad	Merge pull request #6765 from Ultimaker/CURA-6522_revert_edge_distance_hack ... Cura 6522 revert edge distance hack	2019-12-10 13:35:44 +01:00
Remco Burema	5681c631a2	Merge pull request #6781 from Ultimaker/CURA-6941_fix_intent_UI_dark_theme ... Cura 6941 fix intent ui dark theme	2019-12-10 13:30:17 +01:00
Kostas Karmas	6ae0e08b7d	Change RadioCheckbar active button color ... The RadioCheckbar active button is now using the slider_groove_fill value instead of the small_button_active value to avoid issues in case the small_button_active and small_button_text are used together.	2019-12-10 13:19:10 +01:00
Jaime van Kessel	1b80ec8fff	Fix incorrect casing ... Minor issue and I didn't want to send it back to todo *again* because of it. CURA-6522	2019-12-10 13:14:54 +01:00
Jaime van Kessel	f66b1e6fde	Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack	2019-12-10 13:06:37 +01:00
Jaime van Kessel	7ba1db830a	Re-enable the retraction min travel setting ... CURA-6675	2019-12-10 13:00:29 +01:00
Kostas Karmas	c0ac03f2ae	Change Custom profiles title similar to Default ... CURA-6941	2019-12-09 14:35:19 +01:00
Kostas Karmas	5b9bd46ba3	Change active intent line to white ... The activated part of the intent lines will now be white instead of grey. CURA-6941	2019-12-09 14:31:43 +01:00
Kostas Karmas	64decc7345	Change unselected intent to outline (dark theme) ... The unselected intent radio buttons in the default profiles are by default white-filled. This is fixed to have a white outline and be filled with the main background's color. CURA-6941	2019-12-09 14:24:27 +01:00
Ghostkeeper	6aa8d060d5	Make template a bit less intimidating and restore brackets again ... I think the 'why' of things is not always relevant and makes people prevent reading all of it. Keep it brief! And with all of this information that people tend to just leave there it's hard to find the actual changes that people made to the template. That's also why the brackets are important, so that it's easy to see that people didn't erase the original template text. We used to have HTML comment codes there but then people put the actual bug report inside the comments as well and nothing showed up, so this is somewhat of a middle ground that everyone understands, programmers and non-programmers.	2019-12-09 12:56:30 +01:00
novamxd	0c9b5c6f78	Merge branch 'master' of https://github.com/Ultimaker/Cura	2019-12-09 01:59:32 -06:00
novamxd	f2428ccb52	Revamped ChangeAtZ. ... Added comments. Added support for changing Retract Length and Speed. Applied code refactoring to clean up various coding styles. Broke up functions for clarity. Fixed issue of cumulative ChangeZ mods so they can now properly be stacked on top of each other. Removed layer spread option in favor for fixing ChangeZ stacking Split up class so it can be debugged outside of Cura.	2019-12-09 01:56:01 -06:00
Nino van Hooff	2dc4681d91	Remove some mid-sentence newlines from issue templates ... Newlines are tragically not ignored by Github when rendering issue\ templates, it seems	2019-12-06 14:29:05 +01:00
Nino van Hooff	c47aca2f1b	Break down the issue template header into sections. ... I fear people might simply ignore the header, which is surrounded by comment tags. Having headings for all important pieces of information might make them stand out more.	2019-12-06 14:23:42 +01:00
Nino van Hooff	dd8993e88c	revert 0 buildvolume edgedisallowedsize for one_at_a_time ... Turns out that the artificial disallowed area around the inside of the build volume was necessary to take the brim into account when deciding whether a model was outside the buildvolume. The issue for which I removed this in the first place seems not to be an issue anymore due to other commits Reverts and e5fb9fb8 and e5c9bca CURA-6522	2019-12-06 12:17:21 +01:00
Nino van Hooff	4ad954f23e	Fix TestCuraSceneNode ... CURA-6522	2019-12-06 12:00:40 +01:00
Nino van Hooff	f4c68f4e71	Fix two mypy warnings ... CURA-6522	2019-12-06 11:47:07 +01:00
Nino van Hooff	2d8a415a69	Use the printing area (hull + adhesion for one-at-a-time) instead of ... convex hull for build volume collision detection. The convex hull is not suitable for this purpose because for one-at-a-time it includes the machine head polygon, which should be allowed to travel outside the build volume CURA-6522	2019-12-06 11:08:55 +01:00
Ghostkeeper	f7709c11bc	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2019-12-05 15:31:51 +01:00
Ghostkeeper	4a9f09fa67	Merge branch 'patch-1' of https://github.com/juanluisvaladas/Cura into juanluisvaladas-patch-1	2019-12-05 15:30:42 +01:00
Jaime van Kessel	4811f15a7b	Merge pull request #6662 from Ultimaker/CURA-6981_add_build_type ... CURA-6981 Add build_type into crash reports and stats	2019-12-05 15:09:38 +01:00
Ghostkeeper	250774c4cd	Merge branch 'master' of https://github.com/iLyngklip/Cura into iLyngklip-master	2019-12-05 11:19:42 +01:00
ninovanhooff	19da7b932a	Merge pull request #6751 from Ultimaker/CURA-6994 ... CURA-6994/Prevent deleting comments from Start/End G-codes	2019-12-04 15:42:52 +01:00
Nino van Hooff	fc060f7724	Do not show any object shadows in all_at_once mode. ... Also DRYed up the one_at_a_time check CURA-6522	2019-12-04 15:33:31 +01:00
Nino van Hooff	b30b641034	Merge remote-tracking branch 'origin/CURA-6522_one_at_a_time_overlapping_build_area' into CURA-6522_one_at_a_time_overlapping_build_area	2019-12-04 14:28:48 +01:00
Nino van Hooff	e2db4e873d	Add paramteter to Config Parser constructor to prevent comments in ... Gcode to be remnoved by upgrade, as in CURA-6994 CURA-6522	2019-12-04 14:28:30 +01:00