22036 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
Jaime van Kessel	ea02bdf40a	Also bump up the setting version of files changed since this branch was branched ... CURA-6522	2019-11-20 16:51:15 +01:00
Jaime van Kessel	50d72692d8	Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_one_at_a_time_overlapping_build_area	2019-11-20 16:48:00 +01:00
Jaime van Kessel	266f7d1f74	Also bump up the version nr of FDMExtruder & FDMPrinter ... CURA-6522	2019-11-20 16:39:38 +01:00
Remco Burema	9aeb9912c8	Merge branch '4.4'	2019-11-19 15:57:52 +01:00
Dimitriovski	caec6ff27c	Changed the SettingVersion from CuraApplication.py ... CURA-6522_one_at_a_time_overlapping_build_area	2019-11-19 15:46:32 +01:00
Dimitriovski	94a5b5ef90	CURA-6522_one_at_a_time_overlapping_build_area ... Changed the setting_version to 11	2019-11-19 15:27:17 +01:00
Remco Burema	df1e0abd93	Merge branch '4.4' of https://github.com/Ultimaker/Cura into 4.4	2019-11-19 14:23:10 +01:00
Remco Burema	f1f0290458	Re-enable the Polish language. ... part of CURA-6957	2019-11-19 14:22:53 +01:00
Ellecross	2d35343538	Merge branch '4.4' of https://github.com/Ultimaker/Cura into 4.4	2019-11-19 13:17:37 +01:00
Ellecross	d425764da8	Added contributors to PRs	2019-11-19 13:17:33 +01:00
Jaime van Kessel	c6f42766c7	Remove hardcoded sizes from dialogs & popups ... Contributes to #6670	2019-11-19 13:00:39 +01:00
Remco Burema	9e32f715bb	Merge branch 'translations_4.4' into 4.4	2019-11-19 12:08:38 +01:00
Remco Burema	1c4998a204	Merge pull request #6668 from Patola/4.4 ... Updated pt_BR strings for Cura 4.4.	2019-11-19 11:59:36 +01:00
Remco Burema	dfe468ef68	Added translations from out Brazilian volunteer. ... part of CURA-6957	2019-11-19 11:58:39 +01:00
Remco Burema	5cae2fd098	Merge branch '4.4' into translations_4.4	2019-11-19 11:54:08 +01:00
Ellecross	b74ee97048	Update change_log.txt to have 4.4 changes	2019-11-19 11:49:30 +01:00
Remco Burema	4ebec11fc7	Added 16 missing strings from lionbridge. ... part of CURA-6957	2019-11-19 11:40:11 +01:00
Jaime van Kessel	650377c819	Merge branch '4.4' of github.com:Ultimaker/Cura	2019-11-18 11:38:11 +01:00
Jaime van Kessel	377a21071b	Remove color from discard dialog text, since it uses system style ... Originally a lot of text would not be readable when in dark theme because the text would be light, but the background would always be white.	2019-11-18 11:33:36 +01:00
Cláudio 'Patola' Sampaio	39756b4e27	Updated pt_BR strings for 4.4	2019-11-16 13:16:11 -03:00
Cláudio 'Patola' Sampaio	ec4831f0d0	Updated pt_BR strings for 4.4	2019-11-16 13:15:14 -03:00
Cláudio 'Patola' Sampaio	bce574c10b	Updated pt_BR strings for 4.4	2019-11-16 13:14:07 -03:00
Cláudio 'Patola' Sampaio	5894292935	Updated pt_BR strings for 4.4	2019-11-16 13:09:49 -03:00
Remco Burema	3f90566edc	Added Polish translation by one of our volunteer translators. ... part of CURA-6957	2019-11-15 17:04:53 +01:00
Jaime van Kessel	08ca213127	Add extra update for Combobox	2019-11-15 11:35:06 +01:00
Remco Burema	22fe13890e	Make sure translations are loaded before init. Intents. ... part of CURA-6957	2019-11-14 18:26:46 +01:00
Remco Burema	ed63a9037d	Add raw Lionbridge translations. ... part of CURA-6957	2019-11-14 16:47:08 +01:00
Remco Burema	300990ad89	Add Traditional Chinese from one of our volunteer translators. ... part of CURA-6957	2019-11-14 16:44:08 +01:00
Jaime van Kessel	33bfebb275	Merge branch 'master' of github.com:Ultimaker/Cura	2019-11-14 11:21:01 +01:00
Jaime van Kessel	c65ccf29b0	Merge branch 'mb-shared-heater' of https://github.com/smartavionics/Cura	2019-11-14 11:06:12 +01:00
Remco Burema	6127c99b64	Added a public key so the 'enterprise' build will start. ... (sort of) part of CURA-6856	2019-11-13 17:14:46 +01:00
Lipu Fei	ebea5fbd14	Merge 4.4	2019-11-13 11:22:15 +01:00
Lipu Fei	c08e7df277	Fix typing ... CURA-6976	2019-11-13 11:10:12 +01:00
Nino van Hooff	fe27193c98	Add dict key check for a crash found in IntentManager ... CURA-6976	2019-11-13 11:01:03 +01:00
Nino van Hooff	eb4eddd49e	Add dict key check for a crash found in IntentManager ... CURA-6976	2019-11-12 15:39:44 +01:00
Nino van Hooff	c31c1dd6fb	Refactor: simplify SimulationSliderLabel font metrics	2019-11-12 14:56:56 +01:00
Nino van Hooff	504eacce66	Merge remote-tracking branch 'origin/master'	2019-11-12 14:55:12 +01:00
Nino van Hooff	27b4e9a063	Refactor: simplify SimulationSliderLabel width	2019-11-12 14:55:00 +01:00
Nino van Hooff	f4b9c0fdd4	Fix SimulationSliderLabel width	2019-11-12 14:52:11 +01:00
Nino van Hooff	ae245ed0e5	Cleanup: remove warnings for non-existing margins	2019-11-12 14:51:48 +01:00
Lipu Fei	d70a6e81b1	Merge 4.4	2019-11-12 14:39:30 +01:00
Lipu Fei	77c194464e	Fix tests	2019-11-12 14:33:54 +01:00
Lipu Fei	8228c6a743	Make sure position is not None ... CURA-6974	2019-11-12 14:22:21 +01:00