12694 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lipu Fei	507b967946	Minor fixes ... CURA-4868	2018-01-29 14:50:07 +01:00
Jaime van Kessel	0e5395dfd5	Fix crash when removing manually added device. ... I forgot to rename a variable :( CURA-4861	2018-01-29 14:29:13 +01:00
Aleksei S	b5856d6577	Merge branch '3.2' of github.com:Ultimaker/cura into 3.2	2018-01-29 13:48:23 +01:00
Aleksei S	750a86d2fd	Added new lines to distinguis error message ... CURA-4876	2018-01-29 13:47:24 +01:00
Ghostkeeper	fec553dbee	Return true after successfully writing the file ... This is how Uranium detects that it's been written successfully. Contributes to issue CURA-4872.	2018-01-29 13:06:38 +01:00
Lipu Fei	b9fc3997e5	Fix jellybox -> imade3d_jellybox renaming ... CURA-4863	2018-01-29 13:00:48 +01:00
Ghostkeeper	2d48fbb608	Rename file_type parameter to relation_type ... It was renamed in libCharon for better semantic meaning. Contributes to issue CURA-4872.	2018-01-29 12:51:23 +01:00
Lipu Fei	7dfc1a4aa7	Add encoding='utf-8' for text file reading ... CURA-4875 When encoding is not provided, the behaviour is system dependent and it can break on OS X.	2018-01-29 12:29:20 +01:00
Lipu Fei	63ac8412e6	Fix importing legacy INI quality profiles ... CURA-4876	2018-01-29 11:18:16 +01:00
Ghostkeeper	fc23787c1c	Merge branch '3.2'	2018-01-29 10:37:59 +01:00
Ghostkeeper	58dc6e2b0f	Add new strings to each translation ... This merges the updated translation templates (.pot) into the existing translations (.po). Contributes to issue CURA-4883.	2018-01-29 10:37:47 +01:00
Ghostkeeper	650ca4e5e8	Merge branch '3.2'	2018-01-29 10:25:29 +01:00
Ghostkeeper	a40d13b50e	Update translation templates for Cura 3.2 ... Contributes to issue CURA-4883.	2018-01-29 09:50:12 +01:00
Ghostkeeper	09c7b7351a	Merge branch '3.0' ... Found some commits in here that weren't merged.	2018-01-29 09:12:59 +01:00
Ian Paschal	757f83fad2	Change download source ... `update_url` is used only for updaitng plugins (when `file_location` refers to a place on the hard drive).	2018-01-26 17:06:36 +01:00
Ghostkeeper	6f833051f8	Close archive after writing ... It gets flushed then and everything. Contributes to issue CURA-4972.	2018-01-26 16:28:34 +01:00
Ghostkeeper	e3e8e8b170	Fix opening kitty file ... Contributes to issue CURA-4872.	2018-01-26 16:21:01 +01:00
Ghostkeeper	20b903855f	Close streams before opening the next ... Because zipfile can't handle multiple open streams at the same time. Contributes to issue CURA-4872.	2018-01-26 16:15:30 +01:00
Ghostkeeper	b6c7a0829f	Use virtual_path parameter instead of target ... This parameter was renamed. Contributes to issue CURA-4872.	2018-01-26 15:43:14 +01:00
Ghostkeeper	d299786de7	Convert g-code to bytes before writing it to archive ... Contributes to issue CURA-4872.	2018-01-26 15:41:39 +01:00
Ian Paschal	211f87bf09	New format and functionality ... - Browser is combined with plugin settings - Two tabs, one for viewing 3rd party plugins, one for installed - Enable/disable for bundled plugins - Install/Remove/Update for 3rd party plugins	2018-01-26 14:59:47 +01:00
Lipu Fei	4a9fc4b7d4	Set imported containers to bedirty so they will get saved ... CURA-4875	2018-01-26 14:17:18 +01:00
Diego Prado Gesto	a0ebb5205b	Merge branch 'master' of https://github.com/Ultimaker/Cura	2018-01-26 14:14:59 +01:00
Ghostkeeper	8bd351c133	Add placeholder thumbnail to package ... This kitten really likes boxes of all kinds: Cardboard and plastic boxes for sure, but also digital boxes such as the UFP. Contributes to issue CURA-4872.	2018-01-26 13:52:20 +01:00
Ghostkeeper	8a3a3d32da	Fix imports to Charon classes ... Contributes to issue CURA-4872.	2018-01-26 13:34:45 +01:00
Ghostkeeper	600e2abce1	Add basic UFP writer plug-in ... This already implements most of it. Just the thumbnail must still be gotten and put inside the container. Contributes to issue CURA-4872.	2018-01-26 13:25:49 +01:00
ChrisTerBeke	6cd64e1ce8	Two more fixes for typo in USBPrinterOutputController	2018-01-25 22:47:48 +01:00
ChrisTerBeke	8c7f8fa1fa	Fix typo in USBOutputController	2018-01-25 22:34:28 +01:00
Jaime van Kessel	bcfac3ace6	Added very rough implementation for UCP files	2018-01-25 17:14:32 +01:00
Diego Prado Gesto	38f1ad5db9	Merge branch '3.2'	2018-01-25 17:10:17 +01:00
fieldOfView	a1adce298e	Add color to "recommended"/"custom" button texts	2018-01-24 16:56:53 +01:00
fieldOfView	1a56eae186	Bring SettingOptionalExtruder up to speed	2018-01-24 16:46:53 +01:00
fieldOfView	6480926869	Add swatches in extruder dropdown	2018-01-24 16:44:15 +01:00
fieldOfView	19e74a2d45	Add extruder combobox popup styling	2018-01-24 16:29:36 +01:00
Ghostkeeper	4f72f52447	Reduce minimum value for flow to 0.0001% ... CuraEngine can handle that. It's not going to extrude anything, but neither is 5% really. Contributes to issue CURA-4506.	2018-01-24 16:29:24 +01:00
Ghostkeeper	b9fe0046f2	Merge branch 'initial_layer_flow' of https://github.com/BagelOrb/Cura into BagelOrb-initial_layer_flow ... Contributes to issue CURA-4506.	2018-01-24 16:20:48 +01:00
Ghostkeeper	ae40071ffd	Merge branch '3.2'	2018-01-24 16:17:49 +01:00
Ghostkeeper	1818055966	Merge branch 'master' of github.com:Ultimaker/Cura	2018-01-24 16:17:24 +01:00
fieldOfView	428dfeaed7	Add combobox popup styling	2018-01-24 16:08:56 +01:00
Diego Prado Gesto	d72e08a3ba	Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2	2018-01-24 16:05:28 +01:00
Diego Prado Gesto	e38cf957bb	CURA-4839 Avoid creating unique names for the extruder instance ... containers if the strategy is upgrade existing	2018-01-24 16:04:11 +01:00
ChrisTerBeke	9af3a5faa6	Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2	2018-01-24 14:02:54 +01:00
ChrisTerBeke	d1f2d6f45d	Fix checking material_used per extruder for analytics - CURA-4858	2018-01-24 14:02:44 +01:00
Ghostkeeper	3f7eaaae94	Move HTML tags out of translated text ... We always want the same HTML tag around it. There's no need to allow the translator to change that. Discovered during issue CURA-4692.	2018-01-24 13:52:31 +01:00
Ghostkeeper	d6182c8c49	Fix extra space in translation ... The only mistake I found, really. Contributes to issue CURA-4692.	2018-01-24 13:52:31 +01:00
Ghostkeeper	5b90bb3c5a	Update Portuguese translations by Utópica3D ... These people did a pass on the Portuguese translations and made a lot of improvements. Contributes to issue CURA-4692.	2018-01-24 13:52:31 +01:00
ChrisTerBeke	c471991044	Update plugin browser version to 4 as network rewrite has another set of breaking changes	2018-01-24 13:30:08 +01:00
ChrisTerBeke	b41d8eb0dd	Merge branch '3.2'	2018-01-24 13:29:30 +01:00
ChrisTerBeke	9488c39f68	Update plugin browser version as we have breaking changes in Cura 3.2	2018-01-24 11:07:13 +01:00
Lipu Fei	a6f5f8ea68	Revert "Revert "Rename Enable Travel Optimization to Infill Travel Optimization"" ... This reverts commit 3ec4cc6a0ba466df7d454084b51a0becbc3d7d32.	2018-01-23 20:37:24 +01:00