15505 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mark	17f51ca704	Merge branch 'master' into patch-2	2018-08-29 13:55:42 +02:00
Lipu Fei	49743d8e6c	Merge pull request #4299 from Ultimaker/remove_maximum_length_printer_address ... Remove the 40 char maximum on printer address textfield	2018-08-29 12:53:14 +02:00
Lipu Fei	c1e4b5f80d	Merge branch 'master' into remove_maximum_length_printer_address	2018-08-29 12:49:16 +02:00
Ghostkeeper	1d8f19f1d1	Don't give error value for infill layer thickness if no infill ... It won't crash the engine because the entire infill filling routine is skipped.	2018-08-29 11:55:37 +02:00
Mark	dda356fbc4	Remove the 40 char maximum on printer address textfield	2018-08-29 11:50:43 +02:00
Ian Paschal	694cc91ae9	Add a "Favorites" heading to materials menu ... Contributes to CURA-5162 Also fixed some non i18n strings	2018-08-28 11:21:47 +02:00
Lipu Fei	40c4e9c5df	Fix KeyError color_code in BaseMaterialsModel	2018-08-28 09:56:00 +02:00
Aleksei S	3e3f1cb03d	Remove double shortcut buttons ... CURA-5642	2018-08-28 09:31:05 +02:00
Aleksei S	fe9cada459	Increase plugin API version to 5 ... CURA-5627	2018-08-27 13:59:00 +02:00
Lipu Fei	22ccf074f3	Only check if printing extruder is enabled for printing meshes ... CURA-5669	2018-08-27 13:20:21 +02:00
Ian Paschal	d097b06479	Merge pull request #4284 from Ultimaker/CURA-5668_fix_quality_fallback ... CURA-5668 Fix quality lookup fallback mechanism	2018-08-27 11:58:18 +02:00
Lipu Fei	9d1b115f2a	Merge pull request #4244 from Ultimaker/feature_favorite_materials ... Feature favorite materials	2018-08-27 11:12:08 +02:00
Ghostkeeper	45e3355318	Catch failure to parse QML component ... Don't crash the application then.	2018-08-27 10:57:58 +02:00
Ghostkeeper	336ea150d9	Change tabs into spaces ... As per our code style.	2018-08-27 10:45:18 +02:00
Lipu Fei	33f495442a	Remove unneeded code ... CURA-5162	2018-08-27 10:44:41 +02:00
Ghostkeeper	eac70dc06d	Change default print job name to 'Untitled' ... This is more common for documents that don't yet have a title in many applications.	2018-08-27 09:41:19 +02:00
Thomas Karl Pietrowski	82570ee35f	bq Hephestos2: Getting a rid of custom g-code ... * Getting a rid of M800: This removes M800 completely. The problem is basically that M800 sets the temperature to 200deg. As a result we tell the firmware to heat up to e.g. 205deg, then M800 kicks in and sets the temperature to 200deg and then we heat up to 205deg again. Therefore I looked into the firmware and extracted all g-code lines except the one which tells to go to 200deg. * Getting independent of bq's fork and therefore adding compatibility to Marlin We use standard g-code, which is safe to be used with both firmware. Note: This change might be also interesting for other bq products, but can't test on them. Therefore it is up to bq and/or the owners of these products to contribute and correct this here, as I did.	2018-08-25 14:46:21 +02:00
Lipu Fei	8daf02063d	Fix quality lookup fallback mechanism ... CURA-5668 The last fallback is the global qualities, either machine-specific or generic, but not using both. Because if a machine defines its own global qualities, it is intended to override the existing ones, so do not fallback again in this case.	2018-08-24 15:35:03 +02:00
Ghostkeeper	aa03fabc57	Remove trailing whitespace	2018-08-24 15:24:00 +02:00
Ian Paschal	eea3fc95a4	Merge pull request #4265 from Ultimaker/CURA-5656_new_s5_alu_profiles ... CURA-5656 Add quality profiles for S5	2018-08-24 15:05:47 +02:00
Ian Paschal	2304aeaceb	Expanded states preserved when updating models ... Did this so that models can be updated more often fixing bugs where when a material is set as "not favorite" in the favorites section, its updated accordingly in its "normal" section. It's also the ground work for saving material section expansion to preferences. Contributes to CURA-5378	2018-08-24 12:10:32 +02:00
Ian Paschal	13069a2f99	Some file renaming ... Contributes to CURA-5378	2018-08-24 11:06:44 +02:00
Lipu Fei	61c635fbaf	Mock application in unit tests	2018-08-24 10:47:01 +02:00
Ian Paschal	93645e6bfe	Reduce component sizes ... Contributes to CURA-5378	2018-08-24 10:46:23 +02:00
Ian Paschal	f6b43bd9ab	Merge branch 'master' into feature_favorite_materials ... Contributes to CURA-5162, CURA-5378	2018-08-23 17:24:39 +02:00
Lipu Fei	01cf9ee23b	Remove "Experimental" text	2018-08-23 17:08:27 +02:00
Lipu Fei	26fced22bb	Add quality profiles for S5 aluminum ... CURA-5656	2018-08-23 17:08:15 +02:00
Lipu Fei	8582a1ba1a	Mock application in unit tests	2018-08-23 17:00:57 +02:00
Ian Paschal	6be9b5e27f	Consolidate models some more ... Contributes to CURA-5162, CURA-5378	2018-08-23 16:58:23 +02:00
Ian Paschal	56a5f59964	Cleaner code ... I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though. Contributes to CURA-5162, CURA-5378	2018-08-23 16:39:40 +02:00
Ian Paschal	8da7773600	Remove unused code ... Contributes to CURA-5162, CURA-5378	2018-08-23 16:04:51 +02:00
Ghostkeeper	49e3c23d14	Brackets on new line ... As per our code style.	2018-08-22 16:53:27 +02:00
alekseisasin	0d293ddced	Merge pull request #4251 from Ultimaker/CURA-5645_no_write_gcode_to_recent_files ... CURA-5645 Do not add saved gcodes to recent files list	2018-08-22 16:28:58 +02:00
Ian Paschal	6225fff1f8	Re-added material detail view ... Contributes to CURA-5378	2018-08-22 15:58:58 +02:00
alekseisasin	ff38ee2bed	Merge pull request #4245 from Ultimaker/CURA-5649_hide_gcodegz_in_save_dialog ... CURA-5649 Do not show gcode.gz as an option in save file dialog	2018-08-22 14:12:08 +02:00
Lipu Fei	29180740de	Fix missed names	2018-08-22 13:36:17 +02:00
Lipu Fei	94ce9205c3	Remove pytest cache	2018-08-22 13:30:59 +02:00
Ian Paschal	00eb8e6788	Organize material preferences ... Contributes to CURA-5378	2018-08-22 12:34:38 +02:00
Ian Paschal	272e892179	Extend Cura Light theme for material favorites ... Contributes to CURA-5162, CURA-5378	2018-08-22 12:33:55 +02:00
Ian Paschal	cb713eea6a	Improve models ... Contributes to CURA-5162, CURA-5378	2018-08-22 12:33:29 +02:00
Ian Paschal	08b325ee04	Correctly load material favorites from preferences ... Contributes to CURA-5378, CURA-5162	2018-08-22 12:31:48 +02:00
Lipu Fei	af64d91587	Fix stack handling in project loading ... CURA-5663	2018-08-21 16:07:17 +02:00
Cherubim	f35005c8ba	Brackets on new line ... As per our code style.	2018-08-21 14:24:07 +02:00
Lipu Fei	10e474ad27	Add draft shield distance into the prime tower position fomulas ... CURA-5644	2018-08-21 13:38:56 +02:00
Aleksei S	4635c8117d	Add changed_settings(retraction_combing) to Version Upgrade Cura3.4 ... CURA-5505	2018-08-21 11:49:13 +02:00
Remco Burema	ca25638c07	.ufp should also not show up in recent files since it's a gcode format	2018-08-21 11:01:35 +02:00
Ian Paschal	6d1fd8281c	Add favorites funcitonality to MaterialManager.py ... Contributes to CURA-5378	2018-08-20 17:17:14 +02:00
Ian Paschal	68bccd8bf7	Improve the Favorites, Base, and Brand materials models (WIP) ... Contribuetes to CURA-5378	2018-08-20 17:16:54 +02:00
Ian Paschal	2410c21839	Move material list to separate QML file ... Contributes to CURA-5378	2018-08-20 17:16:05 +02:00
Lipu Fei	1468ac1d59	Check if dict has key before accessing in BuildVolume	2018-08-20 13:20:52 +02:00