21225 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jaime van Kessel	53aaaab891	Add a topMargin for the qualities menu ... CURA-6598	2019-09-04 16:43:59 +02:00
Lipu Fei	f2ef363c01	Fix GLTF workaround for OSX ... CURA-6739	2019-09-04 16:39:06 +02:00
Jaime van Kessel	2dbfbecd12	Ensure that show/hide behavior of the qualities intent menu is correct ... It would previously blink if you pressed the button, as a click outside would hide it due to close policy, but a mouse release would show it again (as it's hidden and that's what the on clicked of the button did) CURA-6598	2019-09-04 16:37:10 +02:00
Lipu Fei	7e97bc4e17	Add workaround for GLTF loading on OSX ... CURA-6739	2019-09-04 16:23:57 +02:00
Diego Prado Gesto	79aefa950f	Merge pull request #6298 from bkp23/master ... Fixed PauseAtHeight.py to resume at starting height	2019-09-04 15:54:15 +02:00
Lipu Fei	b67944cac1	Fix workaround for GLTF loading ... CURA-6739	2019-09-04 15:25:58 +02:00
Remco Burema	16ea437255	Make 3MF-reader aware of setting-version for introduction Intent.	2019-09-04 14:52:54 +02:00
Lipu Fei	cadbde7b92	Add workaround for GLTF loading ... CURA-6739	2019-09-04 14:33:24 +02:00
Diego Prado Gesto	f051c48b9e	Add a printer to the list of translation IDs ... Contributes to CURA-6742.	2019-09-04 14:11:57 +02:00
Diego Prado Gesto	1324ff67f6	Merge pull request #6300 from Ultimaker/merge_from_pr_data ... Move profiles from pr-data to main Cura repository	2019-09-04 10:48:38 +02:00
Diego Prado Gesto	ebd3b4b9bf	Change the URL to check for new firmware ... Contributes to CURA-6742.	2019-09-04 10:26:48 +02:00
Marijn Dee	fa2c60810c	Merge pull request #6296 from Ultimaker/CS-278_ignore_material_empty ... Cs 278 ignore material empty	2019-09-04 09:42:59 +02:00
Ghostkeeper	52cb68fdb3	Commit actual files instead of my symlinks ... I've been having this profile added via a symlink so that it would update itself. I didn't know that symlinks were possible in Git. Contributes to issue CURA-6742.	2019-09-04 09:23:27 +02:00
Ghostkeeper	de7915688a	Move profiles from pr-data to main Cura repository ... Don't look too deeply into this, please. Contributes to issue CURA-6742.	2019-09-04 09:16:22 +02:00
B. Perry	6ed57838a9	Fixed PauseAtHeight.py to resume at starting height	2019-09-03 14:02:52 -06:00
ChrisTerBeke	abb1d5d5eb	Merge branch 'master' into CS-278_ignore_material_empty ... * master: Do not trigger slicing if there's no slicable object Fix regex in FlavorParser	2019-09-03 21:30:34 +02:00
ChrisTerBeke	ed616789cb	Remove debug print statement	2019-09-03 21:22:13 +02:00
ChrisTerBeke	86d87acd5b	Filter out configurations for empty materials	2019-09-03 21:21:06 +02:00
Lipu Fei	0524796145	Do not trigger slicing if there's no slicable object ... CURA-6604	2019-09-03 20:01:41 +02:00
Lipu Fei	09dc209956	Fix regex in FlavorParser	2019-09-03 20:01:41 +02:00
Ghostkeeper	e2ed6f03e2	Merge branch 'master' of ssh://github.com/Ultimaker/Cura	2019-09-03 16:42:45 +02:00
Lipu Fei	d154c98476	Merge pull request #6288 from Ultimaker/feature_bottom_face ... Align Face To Build-Plate	2019-09-03 16:14:48 +02:00
Ghostkeeper	a9adceec87	Merge branch 'mb-fix-backend-plugin-crash' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-backend-plugin-crash	2019-09-03 16:14:26 +02:00
Remco Burema	d9b10e7180	Merge branch 'feature_bottom_face' of https://github.com/Ultimaker/Cura into feature_bottom_face	2019-09-03 16:04:38 +02:00
Lipu Fei	a07e88125f	Fix typing ... CURA-6713	2019-09-03 15:58:42 +02:00
Remco Burema	70332978fd	Less cryptic max face-id. ... part of CURA-6745	2019-09-03 15:48:31 +02:00
Lipu Fei	efbcdcc8ac	Add None check in bottomFaceSelection() ... CURA-6745	2019-09-03 15:47:29 +02:00
Lipu Fei	44db4216bc	Rename to getEndFaceSelectionId() ... CURA-6745	2019-09-03 15:44:43 +02:00
Ghostkeeper	2f917c2841	Change definition ID upon reading profile ... Implements CURA-6713.	2019-09-03 15:38:41 +02:00
Remco Burema	503a24f7a1	Make magic value into funtion (max face-id). ... part of CURA-6745	2019-09-03 15:08:41 +02:00
Remco Burema	5b48e13337	Remove 'align face to bottom' from context-menu. ... part of CURA-6745	2019-09-03 14:25:10 +02:00
Ghostkeeper	c41af1b9a0	Remove user-visible XML tags ... These XML tags are outside of the i18n call and are therefore not removed by gettext. They should not be present there.	2019-09-03 14:00:09 +02:00
Jaime van Kessel	c2225c9afc	Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface	2019-09-03 11:27:38 +02:00
Jaime van Kessel	ac0c7fd4d6	Remove unused properties ... CURA-6598	2019-09-03 11:27:11 +02:00
Lipu Fei	39d52556f4	Fix text alignments by using rounding ... CURA-6598	2019-09-03 11:17:20 +02:00
Lipu Fei	52f3f9b773	Update QML import versions and add headings ... CURA-6598	2019-09-03 11:17:20 +02:00
Jaime van Kessel	7dc84f14a8	Merge branch 'feature_intent_interface' of github.com:Ultimaker/Cura into feature_intent_interface	2019-09-03 11:14:19 +02:00
Jaime van Kessel	f77ad22fe3	Fix hardcoded entries in radioCheckbar ... CURA-6598	2019-09-03 11:13:47 +02:00
Lipu Fei	0926c223b2	Add missing renderType: Text.NativeRendering ... CURA-6598	2019-09-03 10:53:53 +02:00
Ghostkeeper	51ed0072db	Apply proposed Creality changes ... These are the changes currently confirmed by multiple people in this comment: https://github.com/Ultimaker/Cura/issues/6106#issuecomment-524241165 Contributes to issue #6106.	2019-09-03 09:48:01 +02:00
SAMSECTOR	cb65cb868e	Update printrbot_simple.def.json ... manufacturer name changed from "PrintrBot" to "Printrbot" to allow the profile under the "Add a printer" menu not appearing in version 4.2.1	2019-09-02 22:20:20 +03:00
SAMSECTOR	957add798b	Update printrbot_simple_extended.def.json ... manufacturer name changed from "PrintrBot" to "Printrbot" to allow the profile under the "Add a printer" menu not appearing in version 4.2.1	2019-09-02 22:14:24 +03:00
Ghostkeeper	f8472d6414	Fix changing name of profiles in quality changes group ... Because quality changes don't have nodes any more. Contributes to issue CURA-6600.	2019-09-02 18:00:04 +02:00
Ghostkeeper	7216a1dbd7	Refer through to correct function of QualityManagementModel ... Contributes to issue CURA-6600.	2019-09-02 17:52:30 +02:00
Ghostkeeper	4043afd09f	Refer _createQualityChanges through to QualityManagementModel ... That's where the function was moved. This function is still being called from various places, even though it's protected. Should change that... Contributes to issue CURA-6600.	2019-09-02 17:47:31 +02:00
Ghostkeeper	a1e6ba615c	Don't use isinstance to check for extruder stack vs. global ... Just use the metadata available. Contributes to issue CURA-6600.	2019-09-02 17:44:28 +02:00
Ghostkeeper	297b430712	Fix getting container registry ... It's not in the fields of this class. Contributes to issue CURA-6600.	2019-09-02 17:42:17 +02:00
Ghostkeeper	b5d32a9b70	Move createQualityChanges function to QualityManagementModel ... This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless). Contributes to issue CURA-6600.	2019-09-02 17:07:18 +02:00
Ghostkeeper	b05de3e6d8	Remove unused import ... Contributes to issue CURA-6600.	2019-09-02 16:48:01 +02:00
Ghostkeeper	1c81174baf	Fix crashing upon creating QualityManagementModel and MaterialManagementModel ... The C++ object should be kept alive in QML. Contributes to issue CURA-6600.	2019-09-02 16:47:35 +02:00