22811 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kostas Karmas	7d33830ae7	Filter out KeyboardInterrupts and MemoryErrors	2020-03-09 15:06:55 +01:00
Jaime van Kessel	d041131f84	Merge branch 'fix_preheat_fields' of https://github.com/fieldOfView/Cura	2020-03-09 13:02:02 +01:00
Ghostkeeper	a56b297074	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2020-03-09 12:52:45 +01:00
Ghostkeeper	466964cf41	Change the sign of comparing against density ... Contributes to issue CURA-7287.	2020-03-09 12:48:07 +01:00
Ghostkeeper	287e31554b	Merge branch 'master' into Skin_Edge_Settings	2020-03-09 12:47:13 +01:00
konskarm	9dec4bc178	Merge pull request #7248 from Ultimaker/CURA-7211_fix_unselected_pos_settings ... Fix two if statements which caused POS settings to be unselectable	2020-03-09 11:49:02 +01:00
Ghostkeeper	c32677d27a	Don't hard-code application name here either ... Seems that there are 30-ish places where this is hard-coded in the rest of our code base too. I'm not going to fix all of those.	2020-03-06 15:58:41 +01:00
Ghostkeeper	b572fc68de	Don't hard-code the application name ... As a response to the comment on commit d501f7730a42e45177fa3cdb89a4cdce1f1bd9a4.	2020-03-06 15:54:23 +01:00
Jaime van Kessel	418a4067df	Add all requirements from cura-build-env to requirements.txt	2020-03-06 14:49:24 +01:00
Jaime van Kessel	588a5c3ff8	Merge branch 'requirements' of github.com:Ultimaker/Cura	2020-03-06 14:23:41 +01:00
Jaime van Kessel	cc66c207ed	Add numpy-stl & requests to requirements file	2020-03-06 13:47:15 +01:00
Ghostkeeper	548c02772d	Gracefully fail if the profile can't be set currently ... Discovered during work on CURA-7283.	2020-03-06 13:40:28 +01:00
Jaime van Kessel	68ad38de28	Fix sizing of the machine action dialog ... Contributes to #7224	2020-03-06 11:02:59 +01:00
Nino van Hooff	c8c4fe65cf	Fix two if statements which caused POS settings to be unselectable	2020-03-06 11:00:56 +01:00
Ghostkeeper	96482398f5	Code style	2020-03-05 23:58:12 +01:00
Jaime van Kessel	74f9125b27	Merge branch 'master' of github.com:Ultimaker/Cura	2020-03-05 16:06:56 +01:00
Jaime van Kessel	bffe79d96c	Add verify_mode to ssl context ... CURA-7176	2020-03-05 16:06:27 +01:00
Ghostkeeper	12a164f8d4	Merge branch 'fix_amf_trimesh_file_watcher' of https://github.com/fieldOfView/Cura into fieldOfView-fix_amf_trimesh_file_watcher	2020-03-05 15:30:41 +01:00
Nino van Hooff	d9509d25ba	Merge pull request #7179 from Ultimaker/CURA-7081_prevent_sys_path_relative ... Remove working directory from sys.path	2020-03-03 10:34:34 +01:00
Ghostkeeper	0e564abbea	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2020-03-02 14:14:51 +01:00
Ghostkeeper	4a754a0735	Realign build plate models ... Contributes to issue CURA-7270.	2020-03-02 14:11:49 +01:00
Ghostkeeper	c4b060ca48	Merge branch 'dagoma_discoultimate' of https://github.com/0r31/Cura into 0r31-dagoma_discoultimate	2020-03-02 13:38:53 +01:00
Jaime van Kessel	d501f7730a	Show Full name for quit message ... We're a bit insecure about Cura, so we have to put the company name in front of it ;)	2020-03-02 10:48:47 +01:00
fieldOfView	7cab2b876c	Fix watching for changes in AMF and trimesh-loaded files ... Fixes #7192	2020-03-01 22:49:58 +01:00
fieldOfView	67af1aa19d	Fix the positioning of multi-line tooltip anchor-points	2020-02-28 23:00:56 +01:00
fieldOfView	00f406b5dd	Add list of active scripts to tooltip	2020-02-28 22:51:37 +01:00
fieldOfView	ddbd843d91	Fix showing tooltips for actionbuttons that have a tooltip text set	2020-02-28 22:31:34 +01:00
fieldOfView	0f662da2c3	Show the number of active postprocessing scripts	2020-02-28 22:29:20 +01:00
Jaime van Kessel	7c70ace8f0	Prevent crash when the start_idx could not be found ... CURA-59	2020-02-28 17:06:57 +01:00
Jaime van Kessel	670a106957	Be a bit more gracefull when adding a machine failed ... This seems to happen for people that manually add machines to cura but mess something up when copying the files. CURA-3X	2020-02-28 17:03:38 +01:00
Jaime van Kessel	27c6cb4c1e	Prevent max recursion for convex hull calculation ... fixes CURA-3W	2020-02-28 16:31:28 +01:00
Jaime van Kessel	f4d1d5d936	Add a check that fixes wrong variants upon setting an active machine	2020-02-28 15:06:11 +01:00
Jaime van Kessel	3cc7382c12	Remove some unused code from TestCuraStackBuilder	2020-02-28 14:29:26 +01:00
Jaime van Kessel	0ccf457314	Split up an overly long call into shorter readable bits	2020-02-28 14:25:50 +01:00
Jaime van Kessel	68d70734ee	Skip nodes in modelchecker without active extruder ... Fixes CURA-5S	2020-02-28 13:56:16 +01:00
Jaime van Kessel	e4930d3c3b	Add missing typing	2020-02-28 13:53:43 +01:00
fieldOfView	d07649fc59	Fix values in print monitor preheat fields ... Contributes to #7172	2020-02-28 12:27:57 +01:00
Ghostkeeper	5e49a5fa24	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2020-02-28 09:47:40 +01:00
Ghostkeeper	832298e586	Merge branch 'patch-7' of https://github.com/thopiekar/Cura into thopiekar-patch-7	2020-02-28 09:37:58 +01:00
Nino van Hooff	0d5a3e1941	Add requirements.txt file ... The wiki page for bulding from source mentions some pip dependencies but misses others. I suggest to pup them here and add a `pip3 install -r requirements.txt` to the wiki	2020-02-27 16:50:02 +01:00
Jaime van Kessel	3958d85a9a	Revert "Prevent zip bombs in the g-codegz reader" ... This reverts commit 27777c759c91965c800080ff4435110900320a96. Resource isn't available on windows, so the solution won't do what needs to be done	2020-02-27 16:30:35 +01:00
Ghostkeeper	d7102729f1	Use spaces instead of tabs ... And remove floating point rounding errors too. Contributes to issue CURA-7260.	2020-02-27 10:57:15 +01:00
Ghostkeeper	f6bc220faa	Merge branch 'master' of https://github.com/skriDude/Cura into skriDude-master ... Conflicts: resources/definitions/skriware_2.def.json -> On master the old setting value was changed to 'value' rather than 'default_value', while on this branch the value was changed to use the resolve function.	2020-02-27 10:54:31 +01:00
Jaime van Kessel	1a44aa6d2e	Ignore comments when checking for temperature prepends ... Fixes #7124	2020-02-27 10:47:32 +01:00
konskarm	ba0eb114f6	Merge pull request #7164 from Ultimaker/Hrybmo-master ... Update to ColorMix.py script	2020-02-27 09:33:10 +01:00
Ghostkeeper	bbb704ff24	Remove working directory from sys.path ... This prevents accidentally loading packages from the working directory that are not in Cura's build. Contributes to issue CURA-7081.	2020-02-26 17:02:40 +01:00
Tim Kuipers	0f4ff1f149	lil: fix naming and spacing to fit code conventions	2020-02-26 15:37:25 +01:00
Tim Kuipers	14d351e185	Merge branch 'master' of https://github.com/Hrybmo/Cura into Hrybmo-master	2020-02-26 15:31:58 +01:00
Ghostkeeper	d84bc5c682	Also check if streams are not closed ... SmartAvionics found that this was a safer way to be able to write to these streams. See comments on commit 2eab2c0f3dbe3153cc704ca9e396cd78b0ebbf9d.	2020-02-26 13:48:27 +01:00
Nino van Hooff	7e2177a8cd	Rename _loginStateChanged for consistency ... CURA-7251	2020-02-25 16:25:03 +01:00