15904 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	d83241f13a	Add missing typing to number of decorators	2018-09-27 14:29:09 +02:00
Ghostkeeper	0ce9bf61be	Move MIME type declarations into constructors of readers ... So that if you disable the plug-in, the MIME type declaration is also not added. Fixes #4151.	2018-09-27 13:58:06 +02:00
Ghostkeeper	88ba2ac345	Define gcode.gz extension in GCodeGzReader ... So if you were to disable the GCodeGzReader plug-in, you will now no longer see the extension in the files you can read. Fixes #4151.	2018-09-27 13:27:42 +02:00
Ghostkeeper	80804b232f	Merge branch 'refactor_singleton_settingsbase'	2018-09-27 11:53:11 +02:00
Ghostkeeper	1717281d2b	Always provide extruder_nr for all models ... Even if you only have one extruder in your printer. This is more consistent, and probably also faster because executing one set-addition in Python is probably still slower than sending those 20 extra bytes over the socket and parsing them in C++... Contributes to issue CURA-4410.	2018-09-27 11:20:24 +02:00
Ghostkeeper	3127108d00	Only set top/bottom pattern to concentric for initial layer ... I'm taking responsibility for this. I'm changing it as a reaction to #4167 since I think concentric is good for the first layer but not so good for the rest of the layers. That user seems to agree but it hasn't been tested thoroughly. It's my intuition, sorry if it went wrong.	2018-09-25 13:17:32 +02:00
Diego Prado Gesto	987ae73078	Remove call to undefined function.	2018-09-25 13:15:26 +02:00
Lipu Fei	51f2386db1	Merge remote-tracking branch 'origin/3.5'	2018-09-25 11:56:12 +02:00
Lipu Fei	8837ffc06d	Fix mateial management QML reference ... CURA-5682	2018-09-25 11:52:53 +02:00
Ghostkeeper	a8493ee35d	Give black materials at least some albedo ... Otherwise you can't see the diffuse reflections and the entire thing just becomes a black silhouette.	2018-09-25 11:24:48 +02:00
Diego Prado Gesto	b52c28321a	Merge branch 'master' into refactor_singleton_settingsbase	2018-09-25 09:38:55 +02:00
Diego Prado Gesto	e31f35ec95	Merge branch '3.5'	2018-09-25 09:36:08 +02:00
Ghostkeeper	7d7227cfc8	Merge branch 'master' into refactor_singleton_settingsbase	2018-09-24 17:25:15 +02:00
Ghostkeeper	c46e0e7556	Only print message about excluded materials if there are any ... Otherwise the message is very strange (with double spaces and such) and unnecessary.	2018-09-24 11:59:02 +02:00
Lipu Fei	fe8aa02e7c	Fix a direct signal emission that causes max recursion error ... CURA-5682 A max recursion error will occur when the user creates a material on the material management page. Too many signals get directly triggered and some of them head back again and causes a max recursion error.	2018-09-24 11:44:55 +02:00
Aleksei S	b44fb7ca24	Select correct material according to the active extruder ... CURA-5682	2018-09-21 17:35:46 +02:00
Ghostkeeper	30ef724322	Update STL MIME type ... Since march, there is now an official MIME type for STL files. See https://www.iana.org/assignments/media-types/model/stl for the new MIME type specification. Fixes #4141.	2018-09-21 14:11:59 +02:00
Aleksei S	86d8f8517d	In material page was not defined the used extruder nr, for generic materials ... CURA-5682	2018-09-21 13:48:46 +02:00
Ghostkeeper	b26c78202b	Consolidate log entries about excluded materials ... I got a log where 80% of the log was this particular message. Let's not do that.	2018-09-21 13:11:12 +02:00
Lipu Fei	a80fde1495	Merge remote-tracking branch 'origin/3.5'	2018-09-21 12:11:18 +02:00
Lipu Fei	1bf78c086d	Remove import plugins which is not a module	2018-09-21 12:03:15 +02:00
Jaime van Kessel	dbe0d6d82a	Add typing	2018-09-21 11:33:06 +02:00
Jaime van Kessel	83d53158bd	Merge branch 'master' of github.com:Ultimaker/Cura	2018-09-21 09:34:34 +02:00
Jaime van Kessel	054a49c63d	Fix issue with inheritance manager button ... Removed one of the special detection cases, since it incorrectly removed a value from a stored profile CURA=5646	2018-09-21 09:33:25 +02:00
Diego Prado Gesto	8352fd1ae0	Merge branch '3.5'	2018-09-21 09:29:17 +02:00
Diego Prado Gesto	4bd5d29970	Don't crash if the plugin is not found (maybe some error while loading). ... In that case it's better not to show the dialog than crashing.	2018-09-20 18:41:30 +02:00
Diego Prado Gesto	2d300ab395	Revert "Fix plugins import in CuraApplication" ... This reverts commit e87f3d7ca9cf135142bee488f188b9639c8b38fd.	2018-09-20 18:34:08 +02:00
alekseisasin	520a181f88	Merge pull request #4383 from Ultimaker/check_setting_visibility ... Test incremental inclusion of setting visibility presets	2018-09-20 16:41:58 +02:00
Jaime van Kessel	2dbaa304a0	Set textFormat for the setting items to PlainText ... Based on the Qt guide on making qml run much faster, it seems that the default of textFormatting (auto) is quite expensive. As we make a *lot* of settingItems, which we don't want to format, it's better to set it to plain. I haven't checked how much faster it actually is, but i didn't see visual changes, so it's at least a safe step.	2018-09-20 15:22:35 +02:00
Lipu Fei	0bc91132ed	Fix check_setting_visibility return value	2018-09-20 15:18:58 +02:00
Lipu Fei	884c5dea67	Add check_setting_visibility.py to Jenkinsfile	2018-09-20 15:14:50 +02:00
Lipu Fei	72b3f9eb2a	Remove debugging lines	2018-09-20 15:12:54 +02:00
Lipu Fei	2c571d5886	Rework check_setting_visibility.py	2018-09-20 15:11:41 +02:00
Lipu Fei	eb114a8529	chmod a+x check_setting_visibility.py	2018-09-20 13:50:06 +02:00
Lipu Fei	6535f7890b	Merge remote-tracking branch 'origin/3.5'	2018-09-20 10:26:17 +02:00
Lipu Fei	f912630d17	Merge pull request #4391 from Ultimaker/CURA-5095_collect_user_modified_settings ... Cura 5095 collect user modified settings	2018-09-20 10:13:27 +02:00
Diego Prado Gesto	7ce3521831	Merge branch '3.5'	2018-09-20 08:57:50 +02:00
Diego Prado Gesto	4111318c7a	Remove duplicate shortcut in French, so the CI won't fail on it.	2018-09-20 08:56:01 +02:00
Ghostkeeper	f99c48575e	Merge branch '3.5'	2018-09-19 17:31:52 +02:00
Ghostkeeper	ea4015c2cf	Fix missing report links ... My IDE crashed while doing a replace all. I see that it missed a few. Contributes to issue CURA-5741.	2018-09-19 17:31:39 +02:00
Ghostkeeper	95c9f9a2d5	Merge branch '3.5'	2018-09-19 17:27:00 +02:00
Ghostkeeper	ec42a96179	Update version number and fix reporting link ... I don't know, did we always have it refer to Uranium's issues page? Contributes to issue CURA-5741.	2018-09-19 17:25:57 +02:00
Ghostkeeper	f6b56a6506	Merge branch '3.5'	2018-09-19 17:16:14 +02:00
Ghostkeeper	91ed1171c2	Update translation sources for Cura 3.5 ... This is updated from the new cura.pot template. Contributes to issue CURA-5741.	2018-09-19 17:15:09 +02:00
Ghostkeeper	f9923e5fe7	Remove duplicate messages ... These were duplicate because CMake of this plug-in put a copy of the JSON file in the build directory. Contributes to issue CURA-5741.	2018-09-19 17:13:53 +02:00
Ghostkeeper	10e0175947	Update translation templates for Cura 3.5 ... These are the new strings for Cura 3.5. Contributes to issue CURA-5741.	2018-09-19 17:10:58 +02:00
Ghostkeeper	04b74d2285	Fix typo in Extra Infill Wall Count description ... Some very observant user found this small typo. Thanks.	2018-09-19 13:58:09 +02:00
Ian Paschal	7ad6fc4cad	Merge pull request #4385 from Ultimaker/monitor_confirmation_dialogues ... Add confirmation dialogues before making destructive changes in UM3/S5 monitor	2018-09-19 13:14:39 +02:00
Aleksei S	cb49ffa2d2	Updated the script according to the requested changes ... CURA-5734	2018-09-18 17:42:01 +02:00
Ghostkeeper	28f743c9f4	Merge branch '3.5'	2018-09-18 17:30:08 +02:00