16676 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	c0d1c35a2b	Removed accidental copy paste	2018-11-28 11:35:48 +01:00
Jaime van Kessel	adf16310c7	Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities ... CURA-5879 experimental qualities	2018-11-28 11:34:21 +01:00
Simon Edwards	8262c2dfd6	Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile ... CL-1150 restyle monitor printer tile	2018-11-28 11:31:11 +01:00
Jaime van Kessel	d9c3faaae2	Codestyle ... CURA-5879	2018-11-28 11:19:37 +01:00
Jaime van Kessel	d09d8a6ae3	Minor codestyle fixes ... CURA-5879	2018-11-28 11:18:36 +01:00
Ian Paschal	9029d10ed0	Remove debug statement ... Contributes to CL-1150	2018-11-28 10:47:34 +01:00
Ian Paschal	370fa0fd14	Remove old sidebar ... Contributes to CL-1150	2018-11-28 10:46:22 +01:00
Ian Paschal	d54a1cb41b	Handle null print job more elegantly ... Contributes to CL-1150	2018-11-28 10:46:12 +01:00
Ian Paschal	255a7fa1fb	Fix binding loop ... Contributes to CL-1150	2018-11-28 10:45:46 +01:00
Diego Prado Gesto	709750c9e2	Add global quality to the Anycubic i3 Mega ... Fixes #4876.	2018-11-28 10:39:32 +01:00
Jaime van Kessel	d8c430abf6	Fix typing	2018-11-27 17:54:53 +01:00
Lipu Fei	2c8ed99281	Add is_experimental to Qt models and QMLs ... CURA-5879	2018-11-27 15:50:03 +01:00
Lipu Fei	c9c7ef7d67	Add "is_experimental" for experimental qualities ... CURA-5879	2018-11-27 15:50:02 +01:00
Jaime van Kessel	854755277c	Fix styling of comments ... Because sentences should start with capitals	2018-11-27 14:37:01 +01:00
Jaime van Kessel	3ad1802ab6	Prevent a KeyError from messing ... CURA-5978	2018-11-27 14:34:29 +01:00
Diego Prado Gesto	a6a364c337	Move material diameter and machine nozzle size to the extruder ... definition. Contributes to CURA-5902.	2018-11-27 13:12:47 +01:00
Diego Prado Gesto	0794a2c8c9	Remove not needed printer and extruder definitions. ... Contributes to CURA-5902.	2018-11-27 13:03:36 +01:00
Diego Prado Gesto	c56098d82c	Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin ... Tests for um3networkplugin	2018-11-27 12:59:44 +01:00
Ian Paschal	fd723e1084	Improve camera icon ... Contributes to CL-1150	2018-11-27 11:19:45 +01:00
Ian Paschal	a3f0630ee9	Rename printer images ... Contributes to CL-1150	2018-11-27 11:19:30 +01:00
Ian Paschal	475a94d10d	Add printer images ... Commit to CL-1150	2018-11-27 10:55:08 +01:00
Ian Paschal	8965695a59	Update MonitorPrintJobProgressBar.qml ... Contributes to CL-1150	2018-11-27 10:54:46 +01:00
Ian Paschal	616ec13457	Change context menu button size ... Contributes to CL-1150	2018-11-27 10:54:26 +01:00
Ian Paschal	7340b6dbc4	Update CameraButton.qml ... Contributes to CL-1150	2018-11-27 10:53:00 +01:00
Ian Paschal	0cd9c8e087	Add machine images ... Contributes to CL-1150	2018-11-27 10:52:49 +01:00
Diego Prado Gesto	f91dbd356d	Merge branch 'master' of github.com:Ultimaker/Cura	2018-11-27 09:51:00 +01:00
Diego Prado Gesto	48853d0d06	Merge branch 'pinchies-add-a-u20'	2018-11-27 09:50:43 +01:00
Diego Prado Gesto	39e1cfd6bc	Fix indentation. ... Contributes to CURA-5902.	2018-11-27 09:50:01 +01:00
Lipu Fei	bd42136712	Fix GcodeStartEndFormatter to use fallback values ... CURA-5901 Use values from the global stack (if exist) as fallback values.	2018-11-27 09:49:38 +01:00
Diego Prado Gesto	493b37b0fe	Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20	2018-11-27 09:44:11 +01:00
Lipu Fei	2e81b97623	Use global_stack.extruders to find extruders ... CURA-5978	2018-11-27 08:45:45 +01:00
pinchies	47ed9e3f5d	deleting the old wrong file....	2018-11-27 15:09:36 +11:00
pinchies	519e2a3399	uploaded wrong file... oops	2018-11-27 15:06:54 +11:00
Diego Prado Gesto	fcc6af68af	Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value. ... Contributes to CURA-5980.	2018-11-26 17:55:25 +01:00
ChrisTerBeke	efd5f3799b	Also catch TypeError now that we have explicit arguments	2018-11-26 16:31:32 +01:00
ChrisTerBeke	6506596ece	Fix typing syntax	2018-11-26 16:19:01 +01:00
Mark	7019afe21f	Merge pull request #4717 from forkineye/fix-wanhao_profiles ... Fix Wanhao profiles to use speed_travel macro	2018-11-26 16:03:25 +01:00
ChrisTerBeke	e4d8fb36ab	Add more typing as per request from @sedwards2009	2018-11-26 15:53:04 +01:00
Mark	39f123f8e0	Merge pull request #4670 from pinchies/add-cc-mm-2 ... Add Cocoon Create ModelMaker	2018-11-26 15:49:21 +01:00
Mark	88cedd25cf	Merge pull request #4664 from pinchies/master ... Add JGAurora Z-603S	2018-11-26 15:47:28 +01:00
Mark	037bf8863e	Merge pull request #4666 from pinchies/add-jg-a5 ... Add JGAurora A5	2018-11-26 15:43:41 +01:00
Mark	734a8882b1	Merge pull request #4667 from pinchies/add-jg-a1 ... Add JGAurora A1	2018-11-26 15:41:30 +01:00
Mark	30c585f298	Merge pull request #4834 from mcmidget/master ... Add BIBO2 printer (dual and single extruder settings)	2018-11-26 15:39:39 +01:00
ChrisTerBeke	da5683c876	add typing to models	2018-11-26 15:30:30 +01:00
Marijn Deé	a382b77eaa	Added validation to the models	2018-11-26 14:30:17 +01:00
ChrisTerBeke	68a90ec510	Use simple models instead of namedtuples ... Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those	2018-11-26 14:08:21 +01:00
Marijn Deé	59510487fa	Merge branch 'tests-for-um3networkplugin' of github.com:Ultimaker/Cura into tests-for-um3networkplugin	2018-11-26 09:50:40 +01:00
Ghostkeeper	5469613c17	Don't fail the samefile check if second file didn't exist ... If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.	2018-11-26 09:40:14 +01:00
Ghostkeeper	c9eb57cead	Don't copy preference file to the same location ... This crashes Cura on start-up for some people.	2018-11-26 09:32:59 +01:00
Ghostkeeper	8f9d6bee62	Document dependency on fdm_materials ... Without it, Cura simply won't start if you had a printer loaded with material profiles. Fixes #4460.	2018-11-26 08:30:24 +01:00