5638 commits

Author	SHA1	Message	Date
Jack Ha	a83b1dd638	Split ShapeArray from Arranger. CURA-3239	2017-04-03 14:48:31 +02:00
Ghostkeeper	2e790852ce	Merge branch '2.5'	2017-04-03 11:38:28 +02:00
Ghostkeeper	b0ecb3ecdf	Unoptimize CPE+, PC and TPU profiles ... There have been some problems in the optimization of these profiles, so we undo this for now, preventing people from editing these materials and risking some warnings in Cura's interface, but providing the correct experience for people trying the new materials.	2017-04-03 11:37:48 +02:00
Lipu Fei	6153fd70a8	Set SettingsComboBox value if we get undefined from resolve ... CURA-3421	2017-04-03 11:10:05 +02:00
Lipu Fei	f57e866119	Move custom functions into FileDialog ... CURA-3495	2017-04-03 10:58:26 +02:00
Jack Ha	abb5d1e76e	Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239	2017-04-03 10:40:04 +02:00
Ghostkeeper	1968f5e1e0	Disable bed temperature instead of making it invisible ... The visible property doesn't exist any more in favour of the enabled property.	2017-04-03 10:34:34 +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	c3e19b5ecb	Add missing import for Screen.devicePixelRatio to work	2017-04-02 14:36:40 +02:00
fieldOfView	d536bbd6b9	Fix Hi DPI issues with Workspace and Profile Changes dialogs	2017-04-02 12:38:41 +02:00
Ghostkeeper	dd2c25868b	Allow strings with actual text ... Previously string fields would only accept numbers, which is ridiculous.	2017-03-30 20:57:23 +02:00
Jaime van Kessel	f82aecb7ca	Refactoring; no longer use "Printer" to identify CuraApplication	2017-03-30 20:19:05 +02:00
Jack Ha	3135dc7d77	Solved MC	2017-03-30 16:20:08 +02:00
Ghostkeeper	1bc383b615	Update Russian translations for Cura 2.5. ... These are provided to us by RaD: github.com/RaD Contributes to issue CURA-3487.	2017-03-30 14:51:08 +02:00
Tim Kuipers	0c6a2f0f6d	Merge branch 'master' into feature_support_stair_width	2017-03-30 12:02:37 +02:00
Tim Kuipers	e4a1d4dce2	JSON fix: default mold width: 5mm (CURA-3512)	2017-03-30 11:17:52 +02:00
Tim Kuipers	a4272bf7be	Merge branch 'master' into feature_mold	2017-03-30 11:16:27 +02:00
MaukCC	4fb3513a7e	Update cartesio_0.25.inst.cfg	2017-03-30 10:29:08 +02:00
MaukCC	c09c044210	Update cartesio_0.4.inst.cfg	2017-03-30 10:27:46 +02:00
MaukCC	05cbd4ad7b	Update cartesio_0.4.inst.cfg	2017-03-30 10:26:13 +02:00
MaukCC	13d11b6cbc	Update cartesio_0.4.inst.cfg	2017-03-30 10:25:34 +02:00
MaukCC	a3be68eb3c	Update cartesio_0.8.inst.cfg	2017-03-30 10:24:33 +02:00
MaukCC	9abb721981	Update cartesio_0.8.inst.cfg	2017-03-30 10:23:51 +02:00
MaukCC	b154a40e54	Update cartesio_0.4.inst.cfg	2017-03-30 10:23:24 +02:00
MaukCC	2c58fd9ac6	Update cartesio_0.25.inst.cfg	2017-03-30 10:22:54 +02:00
MaukCC	4f1641f7b7	Update cartesio_0.8.inst.cfg	2017-03-29 16:36:24 +02:00
MaukCC	731da24788	Update cartesio_0.4.inst.cfg	2017-03-29 16:35:47 +02:00
MaukCC	7bc83a55cd	Update cartesio_0.8.inst.cfg	2017-03-29 16:23:03 +02:00
MaukCC	d8ba5d71ee	Update cartesio_0.4.inst.cfg	2017-03-29 16:22:25 +02:00
MaukCC	21c607c88b	Update cartesio_0.25.inst.cfg	2017-03-29 16:22:07 +02:00
MaukCC	242fa53668	Update cartesio_0.8.inst.cfg	2017-03-29 16:21:14 +02:00
MaukCC	454ce53957	Update cartesio_0.4.inst.cfg	2017-03-29 16:19:54 +02:00
Ghostkeeper	6eeb61c6ff	Merge branch 'maukcc-master'	2017-03-29 13:26:14 +02:00
Ghostkeeper	23a09f7f3c	Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master	2017-03-29 13:25:34 +02:00
jack	a8be748df7	Merge pull request #1599 from Ultimaker/feature_CURA-3495_open_menu ... CURA-3495 Open project/files menu	2017-03-29 12:58:24 +02:00
Lipu Fei	e92c21af28	Remove FIXME ... CURA-3495	2017-03-29 12:53:19 +02:00
Lipu Fei	42b8f06e99	Ignore gcode when selected multiple files ... CURA-3495	2017-03-29 12:52:56 +02:00
Jack Ha	02bb575ced	Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390	2017-03-29 10:56:36 +02:00
Ghostkeeper	6bf3d084b9	Update translation templates ... These are generated from the state of the code at commit b67b41653f. Contributes to issue CURA-3487.	2017-03-29 09:31:01 +02:00
Filip Goc	5cf2f9b021	add jellybox variants ... there’s a one fan variant and a two fan variant. for now, both are only 0.4mm nozzle.	2017-03-28 12:58:22 -04:00
Filip Goc	a328261456	add jellybox specific profiles ... pla and a few petg profiles to get started	2017-03-28 12:57:43 -04:00
Filip Goc	b0627159fa	rename jellybox platform mesh ... jellybox_platform -> imade3d_jellybox_platform	2017-03-28 12:57:03 -04:00
Filip Goc	0d4a74182b	update and rename jellybox definition ... - jellybox -> imade3d jellybox - includes variants	2017-03-28 12:56:19 -04:00
Lipu Fei	208935960f	Add comments for putting open file logic in qml ... CURA-3495	2017-03-28 15:02:50 +02:00
Lipu Fei	e4af8e36bb	Fix dialog text for opening multiple files with project(s) ... CURA-3495	2017-03-28 14:38:26 +02:00
Lipu Fei	1fc7120fff	Fix dialog text "file(s)" -> "files" ... CURA-3495	2017-03-28 14:27:40 +02:00
Lipu Fei	5bec46a29c	Drag-and-drop files behave the same as open file menu ... CURA-3495	2017-03-28 14:27:40 +02:00
Jack Ha	bf08d30e7d	Added first arrange function and smart placement after loading. CURA-3239	2017-03-28 14:27:22 +02:00