1969 Commits

Author	SHA1	Message	Date
fieldOfView	9371b28cb3	Add color swatch for "by material" view style and show proper extruder names	2017-04-25 18:55:25 +02:00
fieldOfView	49880d54ad	Remove code repetition while touching up layout	2017-04-25 18:45:43 +02:00
fieldOfView	0b9f451103	Apply color to layerview legend labels directly ... The Label style property should not be confused with e TextField style property	2017-04-25 18:15:04 +02:00
fieldOfView	2493bd6fe6	Merge branch 'master' into themed-layer-view	2017-04-25 18:06:12 +02:00
daid	50acaaf91f	Some minor changes on review.	2017-04-20 09:35:48 +02:00
daid	26a2fb80dc	Only update the target bed temperature, without submitting it to the printer. To prevent race conditions.	2017-04-19 15:01:47 +02:00
Jaime van Kessel	c20542b7b8	Merge branch 'feature_CURA-3540_upgrade_for_project' of github.com:Ultimaker/Cura	2017-04-18 15:33:53 +02:00
Ghostkeeper	f1ac1bd876	Add JellyBox to XML material printer name translations ... Because the automatic translation removes the underscore, and then the definition can't be found any more. Contributes to issue CURA-3695.	2017-04-18 15:11:24 +02:00
Lipu Fei	b3f60c461b	Fix type hinting and function name for upgrade profile ... CURA-3540	2017-04-14 15:40:18 +02:00
Jaime van Kessel	397b08ce6d	Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura	2017-04-14 11:22:35 +02:00
Lipu Fei	4f2c76e462	Update a profile when deserializing it ... CURA-3540	2017-04-14 10:50:42 +02:00
Jaime van Kessel	d6d6036760	Fixed minor mistake with pull request ... CURA-3681	2017-04-14 10:29:24 +02:00
Jaime van Kessel	04d2f8d68c	Merge branch 'usbprinting-zparseerror-refactor' of git://github.com/tamarintech/Cura	2017-04-14 10:28:14 +02:00
Jaime van Kessel	bb752fa16f	Added more logging	2017-04-13 19:05:13 +02:00
fieldOfView	e92aaca7b6	Filter materials by the (approximate) material diameter of the printer ... If a machine defines material diameter of 2.85mm, there is no use to show the 1.75mm materials and vice-versa	2017-04-12 23:03:58 +02:00
Jaime van Kessel	558b446b4a	Fixed UMO g-code files not being loadable ... The processGcode did not take gcode + comments in the same line into account CURA-3677	2017-04-12 17:32:47 +02:00
Elijah Snyder	b4f6ae8c5f	First refactor for section to increase verbosity and move all translated M105s.	2017-04-10 19:01:59 -05:00
Jaime van Kessel	d02aa7f6a3	Fixed order of close & disconnect ... This would cause the state change caused by close to not be sent to the printer. Fixes CURA-3668	2017-04-10 13:32:37 +02:00
Jaime van Kessel	f5785662f2	Fixed another broken logging	2017-04-10 13:19:05 +02:00
Jaime van Kessel	abe70c3a92	Fixed broken logging	2017-04-10 13:12:14 +02:00
Jack Ha	cebe52b1fe	Merge branch 'master' of github.com:Ultimaker/Cura	2017-04-06 14:08:00 +02:00
Jack Ha	88a8ed9752	Merge branch '2.5'	2017-04-06 14:07:50 +02:00
Jack Ha	f04981b08c	Fixed wifi missing some lines. CURA-3664	2017-04-06 14:06:38 +02:00
Jaime van Kessel	a4afde39ff	Handle connecting & disconnecting a bit more elegant ... CURA-3603	2017-04-06 14:03:41 +02:00
Jaime van Kessel	953d59788e	Only try to close connection when there is a connection to close ... CURA-3603	2017-04-06 13:57:39 +02:00
Jack Ha	1a01d1b193	Change permissions back to 644	2017-04-05 10:19:12 +02:00
Jack Ha	2d6df1ae4a	Fix workspacedialog booboo typo.	2017-04-05 10:18:36 +02:00
Lipu Fei	3f82eae73c	Use layer_id to determine total layer count ... CURA-3615	2017-04-04 16:52:53 +02:00
jack	38fe709736	Merge pull request #1648 from Ultimaker/bugfix_CURA-3615_fix_raft_layer_count ... CURA-3615 Fix total layer count when raft is enabled	2017-04-04 16:47:07 +02:00
Lipu Fei	6b9d3e8041	Merge pull request #1636 from fieldOfView/fix_recent_dialogs ... Fix issues with Workspace and Profile Changes dialogs	2017-04-04 14:35:12 +02:00
Lipu Fei	9f5a1b3695	Merge pull request #1564 from nallath/usb_fixes ... Usb fixes	2017-04-04 12:05:49 +02:00
Lipu Fei	7315a09c7d	Use layer_id to determine total layer count ... CURA-3615	2017-04-04 11:45:30 +02:00
Lipu Fei	5de3a614ea	Merge pull request #1578 from fieldOfView/fix_savitar_gracefull_degradation ... Fail gracefully when libSavitar is not found	2017-04-03 12:53:35 +02:00
fieldOfView	fd09a1959b	Simplify margins and make them DPI aware	2017-04-02 15:54:06 +02:00
fieldOfView	ed8954c1db	Replace font.pixelSize with DPI-aware font.pointSize ... This also uses the same pointSize as eg the PreferencesPage.qml uses	2017-04-02 15:31:35 +02:00
fieldOfView	2e1dd46ea4	Replace hardcoded color with system-theme color	2017-04-02 14:38:11 +02:00
fieldOfView	d536bbd6b9	Fix Hi DPI issues with Workspace and Profile Changes dialogs	2017-04-02 12:38:41 +02:00
Lipu Fei	c5bf107be6	Merge branch '2.5'	2017-03-31 12:12:29 +02:00
Lipu Fei	08071c3aa5	Fix batched GCode compression ... CURA-3604	2017-03-31 12:11:11 +02:00
Jaime van Kessel	f5590a98ed	Added missing close for USB programmer. Thanks to legoabram for the fix	2017-03-30 21:35:26 +02:00
Jaime van Kessel	f82aecb7ca	Refactoring; no longer use "Printer" to identify CuraApplication	2017-03-30 20:19:05 +02:00
Lipu Fei	74e9ee0ab7	Fix batched gcode compression for "print over network" ... CURA-3604	2017-03-30 19:00:41 +02:00
Jaime van Kessel	dbfa5873ce	Merge branch '2.5' of github.com:Ultimaker/Cura	2017-03-30 17:03:01 +02:00
Jaime van Kessel	06fff748e3	Decreased the size of the batches to send, as it froze the interface too much.	2017-03-30 16:59:35 +02:00
Jaime van Kessel	7ae8d96775	Simply reset the authentication when requesting a new one. ... Only changing the state caused a whole lot of issues.	2017-03-30 16:47:08 +02:00
Jack Ha	3135dc7d77	Solved MC	2017-03-30 16:20:08 +02:00
Lipu Fei	bfd77f915d	Compress gcode lines in batch ... CURA-3604	2017-03-30 16:09:17 +02:00
Lipu Fei	c785e84b86	Check len(materialLengths) before using ... CURA-3604	2017-03-30 16:09:16 +02:00
Lipu Fei	ef666aac88	Set gcode_list for Scene after loading gcode ... CURA-3604	2017-03-30 16:09:16 +02:00
Lipu Fei	2158826e06	Change backend state to disabled after reading a gcode ... CURA-3604	2017-03-30 16:09:16 +02:00