20315 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lipu Fei	2a7b887eb2	Use group gitlab runners	2019-07-30 07:51:13 +02:00
Ghostkeeper	3e8ff04aa3	Merge branch '4.2'	2019-07-29 16:44:41 +02:00
Ghostkeeper	399e6d31ae	Remove <strong> tags ... This messes with our layout. The setting title should be bold face, but nothing else. Contributes to issue CURA-6663.	2019-07-29 16:42:17 +02:00
Ghostkeeper	330792feef	Corrections to Dutch ... As a native and a 3D printing expert, and having contributed a lot (perhaps the most) to Cura, I feel entitled to be able to change this. Contributes to issue CURA-6663.	2019-07-29 16:28:41 +02:00
Ghostkeeper	c1e9f75461	Corrections from PoEdit ... These need to be more consistent since it's being followed by data.	2019-07-29 16:10:12 +02:00
Ghostkeeper	6b998642da	Correct authors and latest authors ... Contributes to issue CURA-6663.	2019-07-29 16:05:51 +02:00
Ghostkeeper	21010fef1e	Add missing report e-mails ... Contributes to issue CURA-6663.	2019-07-29 15:57:26 +02:00
Ghostkeeper	f995a1154a	Update PO revision dates ... Contributes to issue CURA-6663.	2019-07-29 15:55:11 +02:00
Ghostkeeper	23b8e33386	Update translations from Lionbridge ... Imported with our new script. Contributes to issue CURA-6663.	2019-07-29 15:52:14 +02:00
Ghostkeeper	00589e9144	Merge branch 'mb-expandable-popup-qt-5.13-fix' of https://github.com/smartavionics/Cura into smartavionics-mb-expandable-popup-qt-5.13-fix	2019-07-29 14:31:57 +02:00
Ellecross	640461eeab	Updated change_log.txt with one letter typo	2019-07-29 13:34:53 +02:00
Jaime van Kessel	d1f6076eb2	Fix the enable & disable extruder for the settings menu ... This fixes #6069	2019-07-29 11:01:31 +02:00
Cláudio 'Patola' Sampaio	4c65a259d7	Updated pt-br strings for Cura 4.2	2019-07-28 08:09:02 -03:00
Mark Burton	d10d3070b9	Qt 5.13 compatibility - fix size of ExpandablePopup background. ... Without this, the view selector dropdown has no background. Tested with Qt 5.13 on Linux and Qt 5.10 on Windows.	2019-07-28 08:03:36 +01:00
Ghostkeeper	7883cf1807	Remove start_layers_at_same_position from user profiles ... There shouldn't be any since the setting was invisible, but just to be sure.	2019-07-26 17:28:44 +02:00
Ghostkeeper	ce01f960b5	Remove references to start_layers_at_same_position	2019-07-26 17:26:40 +02:00
Ghostkeeper	aeabddb54a	Remove start_layers_at_same_position setting ... This setting is no longer configurable since we now slice multi-threadedly.	2019-07-26 17:25:21 +02:00
Ghostkeeper	de7bf3da02	Merge branch '4.2'	2019-07-26 15:55:27 +02:00
Ghostkeeper	b1cbaaef72	Fix warning message appearing for plural forms ... There is no msgstr then so it thinks it's empty. Contributes to issue CURA-6663.	2019-07-26 15:53:42 +02:00
Ghostkeeper	79d57ec10a	Fix comparisons when source is single-line but dest is multi-line ... Or vice-versa. It's now agnostic to number of lines. Contributes to issue CURA-6663.	2019-07-26 15:43:19 +02:00
Ghostkeeper	9e059b7a1a	Fix writing files with plural forms ... Contributes to issue CURA-6663.	2019-07-26 15:31:42 +02:00
Ghostkeeper	23826d3404	Write resulting file ... It seems to fail now for plurals. I didn't think of that yet. Contributes to issue CURA-6663.	2019-07-26 15:07:26 +02:00
Ghostkeeper	58c32f97a1	Add documentation ... Contributes to issue CURA-6663.	2019-07-26 14:23:04 +02:00
Ghostkeeper	a3611404d6	Find translations in source file ... So it can add the translations to the destination file. Contributes to issue CURA-6663.	2019-07-26 14:20:06 +02:00
Ghostkeeper	3f7bd2ac23	Handle iterating over source files and finding correct destination file ... Contributes to issue CURA-6663.	2019-07-26 13:48:10 +02:00
Ghostkeeper	5a03ace239	Also discover Uranium translation directory ... Contributes to issue CURA-6663.	2019-07-26 13:18:47 +02:00
Ghostkeeper	d1c4b63971	Add empty script to perform imports from Lionbridge ... I want to automate this or it'll be a lot of work. Contributes to issue CURA-6663.	2019-07-26 13:18:47 +02:00
Jaime van Kessel	e0c2611a0a	Merge branch '4.2' of github.com:Ultimaker/Cura	2019-07-26 12:47:13 +02:00
Jaime van Kessel	55af42bb46	Merge branch '4.2' of github.com:Ultimaker/Cura into 4.2	2019-07-26 11:38:08 +02:00
Ghostkeeper	9185022295	Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master	2019-07-26 11:16:18 +02:00
Ellecross	b30dbdd9ed	Updated change_log for 4.2 (contributed by Matt) [CURA-6677] ... Updated with the release notes from Matt	2019-07-26 11:08:41 +02:00
Jaime van Kessel	a3dad0fa09	Fix issue with deprecation and pyqtSlot	2019-07-26 10:55:55 +02:00
KOUBeMT	485845acdd	Add_preferred_material_to_definition	2019-07-26 10:42:03 +02:00
KOUBeMT	25de7fc037	Add_preferred_material	2019-07-26 10:38:14 +02:00
Ghostkeeper	67167ca250	Increment version number to Cura 4.2 ... Contributes to issue CURA-6663.	2019-07-25 16:39:35 +02:00
Zhang Heh Ji	8c04d85bde	Add translated strings for Cura 4.2 ... These are the translations made by Zhang. Thank you Zhang!	2019-07-25 16:36:44 +02:00
ChrisTerBeke	87517a77c2	Merge pull request #6057 from Ultimaker/network-plugin-remove-hardcoded-references ... Get rid of any hard-coded references to machines	2019-07-25 16:02:29 +02:00
Lipu Fei	2054f507a4	Merge pull request #6046 from Ultimaker/add_42_43_version_upgrader ... Add 42 - 43 version upgrader	2019-07-25 15:46:06 +02:00
Ghostkeeper	d353776fe8	Fix showing extruder names in USB printing monitor ... It was using a deprecated function. Apparently deprectated pyqtSlots don't work because it breaks the PyQt binding for some reason. That has to be fixed. But for now I'll make this use the non-deprecated function.	2019-07-25 15:17:13 +02:00
ChrisTerBeke	96cf235d8c	Get rid of any hardcoded references to machines	2019-07-25 14:56:46 +02:00
Lipu Fei	9f18ceda51	Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader	2019-07-25 14:56:27 +02:00
Jaime van Kessel	8311a39f08	Fix case where an error in the stack would not prevent slicing ... CURA-6680	2019-07-25 09:42:00 +02:00
Mark Burton	cfea12ab25	Fix dimensions of print job information popup when using Qt 5.13. ... Remains compatible with Qt 5.10.	2019-07-24 20:35:39 +01:00
Jaime van Kessel	004297b936	Merge pull request #6028 from sgtnoodle/stretch_retract ... Preserve extruder-only moves in post stretch script	2019-07-24 17:05:41 +02:00
Ghostkeeper	18d1148c78	Don't reset selected material upon container changed ... The onActiveMaterialChanged signal is triggered upon loading a material for the first time. This is hard to fix without breaking stuff, so we will revert this part. This re-introduces a bug where if you change a material diameter such that the material disappears from the list, it is still selected and you can change its properties in the details panel. Contributes to issue CURA-6679.	2019-07-24 17:01:37 +02:00
Ghostkeeper	be4e754984	Remove cache of material manager ... It doesn't make the code much simpler because the cache is also not a local variable. Contributes to issue CURA-6679.	2019-07-24 16:04:40 +02:00
Lipu Fei	73b7bc3172	Remove verobse flags for pytest	2019-07-24 11:38:10 +02:00
Lipu Fei	80bf8c22ee	Merge remote-tracking branch 'origin/4.2'	2019-07-24 10:56:48 +02:00
Lipu Fei	33739ea7a8	Fix profile upgrade in profile importing ... CURA-6681	2019-07-24 10:55:38 +02:00
Jaime van Kessel	36159116fa	Merge branch '4.2' of github.com:Ultimaker/Cura	2019-07-24 10:30:26 +02:00