13312 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fieldOfView	c3bf0b834d	Fix location of post processing scripts on Linux ... On Windows and OSX, resources and preferences are stored in the same folder. On Linux, preferences are in ~/.config, resources are in ~/.local/shared. Postprocessing scripts belong in the latter, along with all the other resources (definitions, plugins, themes). Fixes #3356	2018-02-20 09:20:01 +01:00
Lipu Fei	6cc65e97f2	WIP: Cleanup MaterialsModel	2018-02-20 09:13:11 +01:00
Lipu Fei	62c31c2f6c	WIP: Remove old QualityManager	2018-02-19 22:11:47 +01:00
Lipu Fei	27f7d16a57	WIP: Make import/export profile work	2018-02-19 21:47:12 +01:00
Lipu Fei	5bb6efcb3e	WIP: Cleanup MachineManager	2018-02-19 21:20:10 +01:00
Lipu Fei	0c3ac090c9	WIP: Cleanup	2018-02-19 21:11:01 +01:00
Lipu Fei	7e84e7570f	WIP: Cleanup ContainerManager	2018-02-19 21:02:33 +01:00
Lipu Fei	2cd9891000	WIP: Fix material QVariant type	2018-02-19 21:00:49 +01:00
MaukCC	106178bf98	Merge pull request #9 from Ultimaker/master ... update	2018-02-19 20:59:32 +01:00
Lipu Fei	3fffc2c621	WIP: Cleanup old QualityManager	2018-02-19 20:50:14 +01:00
Lipu Fei	d4db41503f	WIP: Cleanup ContainerManager	2018-02-19 20:43:05 +01:00
Lipu Fei	5b37de8adb	WIP: Fix quality renaming	2018-02-19 20:33:36 +01:00
Lipu Fei	486bcae677	WIP: Fix remove quality	2018-02-19 20:21:02 +01:00
Lipu Fei	65e01d6203	WIP: Refactor Profile management code	2018-02-19 20:01:51 +01:00
Lipu Fei	c29f3130a7	WIP: Fix QualitySettingsModel	2018-02-19 19:55:09 +01:00
Lipu Fei	251fe8a3a6	WIP: Remove ContainerSettingModel	2018-02-19 17:03:30 +01:00
Lipu Fei	3546e54c95	WIP: Cleanup	2018-02-19 17:01:26 +01:00
Ian Paschal	1d4d592d45	CURA-4790 Added weight properties to theme	2018-02-19 16:52:32 +01:00
Lipu Fei	faf02424a7	WIP: Cleanup MachineManager	2018-02-19 16:50:18 +01:00
Jack Ha	bd10f23311	CURA-4606 reimplemented duplicate profile	2018-02-19 16:47:04 +01:00
Jack Ha	7a78f9821f	CURA-4606 fixed Create profile	2018-02-19 16:15:35 +01:00
Jaime van Kessel	7e8ee00e06	Merge branch 'master' of github.com:Ultimaker/Cura	2018-02-19 15:38:06 +01:00
Jaime van Kessel	3cf16fd34b	Removed sending of material profiles. ... It takes a godawfull long time and the machine ignores most of them anyway.	2018-02-19 15:37:08 +01:00
fieldOfView	51062a4784	Add a button to open the configuration folder.	2018-02-19 15:30:39 +01:00
Jack Ha	8efe13a55a	CURA-4606 fix profiles page Active button	2018-02-19 15:24:58 +01:00
Jack Ha	3ff9cb6b1e	CURA-4606 added first Profile management page	2018-02-19 15:07:50 +01:00
Aleksei S	8d98f20751	Merge branch 'master' of github.com:Ultimaker/cura	2018-02-19 15:05:16 +01:00
Aleksei S	1afe2668f7	Fix: Extreme small model was not automatically scaled.	2018-02-19 15:04:08 +01:00
Lipu Fei	2d5f65a954	WIP: Fix NozzleMenu QObject result type	2018-02-19 14:23:05 +01:00
Ian Paschal	438f11b2e6	CURA-4965 Custom / Duplicated Material's Build Plate Temperature returns to default ... Holy hell that took a long time to figure out. Thanks @diegopradogesto!	2018-02-19 14:09:02 +01:00
Mark	9af6b4d6f6	Merge pull request #3264 from uBuild-3D/patch-1 ... Create ubuild-3d_mr_bot_280.def.json	2018-02-19 13:19:12 +01:00
Mark	aed1b2ab8e	Merge pull request #3325 from fieldOfView/feature_early_crash_config_folder_button ... Add a button to open the configuration folder.	2018-02-19 13:11:00 +01:00
Mark	3e7d7c4167	Merge pull request #3342 from probonopd/patch-4 ... Add AppImageKit to credits	2018-02-19 12:18:09 +01:00
Mark	2b70c83894	Merge pull request #3216 from dagoma3d/dagoma-profiles ... Enhance Dagoma profiles	2018-02-19 12:12:23 +01:00
Jack Ha	5d4a2a7e49	CURA-4606 qtquick dialogs 1.2 to be compatible with older pyqt	2018-02-19 11:04:45 +01:00
Jack Ha	1891294079	CURA-4606 fix material manager to exclude custom materials from some lookup tables	2018-02-19 11:04:45 +01:00
Jack Ha	823ac048fa	Merge branch 'master' of github.com:Ultimaker/Cura	2018-02-19 09:14:10 +01:00
Jack Ha	2c689ef03f	Log markup	2018-02-19 09:14:04 +01:00
Lipu Fei	6124729f01	WIP: Cleanup MachineManager	2018-02-17 22:27:56 +01:00
Lipu Fei	495fc8bbd7	WIP: Refactor BuildPlateModel and split MultiBuildPlateModel	2018-02-17 22:24:05 +01:00
Lipu Fei	1c8f63e47f	WIP: Fix for buildplate	2018-02-17 15:08:47 +01:00
probonopd	e55f2d0355	Update cura.po	2018-02-17 15:02:37 +01:00
probonopd	38502e6829	Update cura.pot	2018-02-17 14:59:58 +01:00
Lipu Fei	236bd09d08	WIP: Refactor quality model files	2018-02-17 14:58:56 +01:00
probonopd	c84ba800d3	Update AboutDialog.qml	2018-02-17 14:58:25 +01:00
probonopd	19eb37e612	Update AboutDialog.qml	2018-02-17 14:53:07 +01:00
Lipu Fei	171a05ae6a	WIP: Fix layer_height fetching that inherits the default ... Fix layer height fetching for those quality profiles that inherits the layer height from the definition.	2018-02-17 14:48:12 +01:00
Lipu Fei	9dce0afaea	WIP: Fix extruder submenu	2018-02-17 14:44:39 +01:00
Lipu Fei	b449f39cc7	WIP: Do not profiles submenu for each Extruder ... You cannot change quality for an individual Extruder, so it doesn't make sense to show that for each Extruder.	2018-02-17 14:39:49 +01:00
Lipu Fei	2cfdbc1b16	WIP: Remove old quality models	2018-02-17 14:10:01 +01:00