14353 Commits

Author SHA1 Message Date
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data
CURA-4644
2018-04-12 15:46:53 +02:00
Diego Prado Gesto
e2d6e18ac9 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-12 14:59:38 +02:00
Diego Prado Gesto
df521dcc93 Change description of a setting.
Contributes to CURA-5222.
2018-04-12 14:56:42 +02:00
Ghostkeeper
13f63a7051
Rename 'No Skin' to 'Not in Skin'
It's a bit more clear, as discussed in #3115. To actually change the functionality requires a bit more effort for which I'll need to make a ticket.
2018-04-12 14:39:46 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Lipu Fei
fdd7807769 Custom qualities are always checkable
CURA-5218
2018-04-12 13:58:20 +02:00
Lipu Fei
406b64b331 Remove unneeded code
CURA-4644
2018-04-12 13:14:58 +02:00
Ghostkeeper
1be6e29494
Merge branch '3.3' 2018-04-11 16:57:49 +02:00
Ghostkeeper
b101ddcf8d
Re-do shortening of Wechseldatentrager to Datentrager
The translation update undid my changes there. That was basically a manual merge. We need to change this again now.

Contributes to issue CURA-5166.
2018-04-11 14:57:45 +02:00
Ghostkeeper
36eef6603f
Update and fix .po file headers
Lots of things out of sync again.

Contributes to issue CURA-5166.
2018-04-11 14:54:31 +02:00
Ghostkeeper
884227336f
Update translations from Bothof
These are the new translation files that the translation bureau sent to us. I've renamed them to fit in our architecture but for the rest they are unaltered.

Contributes to issue CURA-5166.
2018-04-11 14:53:05 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00
Lipu Fei
40eedbcf70 Add more info dialog
CURA-5204
2018-04-10 15:33:32 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93 Make it possible to skip project file check in readLocalFile()
CURA-5203
2018-04-10 11:40:47 +02:00
Mehmet Sutas
0207f4d62d
Update rigid3d_mucit.def.json 2018-04-10 00:06:03 +03:00
Mehmet Sutas
25322e4829
Rigid3D Mucit Cura Definitions 2018-04-09 23:54:53 +03:00
Mehmet Sutas
da6af4912f
Rigid3D Mucit Build Platform Mesh 2018-04-09 23:53:45 +03:00
Gabriele Rossetti
9607fd261a
Upate deltacomb.def.json
bad indenting fixes
2018-04-09 14:21:39 +02:00
alekseisasin
7b9bf23786
Merge pull request #3411 from BagelOrb/support_retraction_setting
setting to disable omitting retractions in support
2018-04-09 13:57:49 +02:00
Aleksei S
c7b6bb8188 Merge branch '3.3' 2018-04-09 12:53:53 +02:00
Lipu Fei
cadb2c62b7 Fix open file with Cura
CURA-5203

When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
2018-04-06 11:55:07 +02:00
Gabriele Rossetti
f4399834b4
Update deltacomb.def.json
Some quality improvements
2018-04-05 17:11:32 +02:00
Lipu Fei
1737267dfd Accept drag-and-drop for curapackage files 2018-04-05 15:14:15 +02:00
Lipu Fei
ed390738f4 Update all qualities and variants to version 4 2018-04-05 15:14:15 +02:00
Aleksei S
c6c35a98b4 Merge branch 'master' of github.com:Ultimaker/cura 2018-04-04 11:10:50 +02:00
Aleksei S
43e535ea54 Rename expandAll to expandRecursive
CURA-5190
2018-04-04 11:04:54 +02:00
Lipu Fei
04571dcb9b Merge branch 'feature_try_line_widths' 2018-04-04 10:49:49 +02:00
Diego Prado Gesto
007529c9ec Merge branch 'feature_material_marketplace' into feature_cura_package_api
Contributes to CURA-5137
2018-04-03 17:13:36 +02:00
Ian Paschal
8a7f9027c5 CURA-5035 Finished layout 2018-04-03 16:57:31 +02:00
Ghostkeeper
4ad9867591
Add setting to try multiple line thicknesses
Engine implementation pending. This setting is intended for debugging problems with interrupted walls. It should probably not be published in a final release.

Contributes to issue CURA-5189.
2018-04-03 16:38:19 +02:00
Fredrik Öhrn
569c5b3178 Set preferred material to proPLA which has a tuned quality profile. 2018-03-31 13:51:38 +02:00
Fredrik Öhrn
1b0848229e Add global quality profiles. 2018-03-31 13:51:38 +02:00
Fredrik Öhrn
a4a388eb4b Fix machine steps type. 2018-03-31 13:51:38 +02:00
Diego Prado Gesto
89c27ae7f4 CURA-5137 Get the list of packages from the server 2018-03-30 15:13:10 +02:00
Ghostkeeper
6d10ac993e
Add option to collapse or expand all setting categories
Sadly it doesn't display on the category headers themselves, but it works just as well.
2018-03-30 15:07:50 +02:00
Ghostkeeper
60a217fc84
Rename expandAll to expandRecursive
Because it doesn't expand all settings, just a category.
2018-03-30 15:07:42 +02:00
Diego Prado Gesto
322fe7d61f CURA-5137 Rename Plugin Browser into Toolbox 2018-03-30 14:15:00 +02:00
Jörg Walter
fa81ebeece GLES shader fixes 2018-03-29 21:07:51 +02:00
Jörg Walter
f0f768cc74 fix bool for pedantic shader compilers 2018-03-29 21:07:12 +02:00
Ian Paschal
f63e67dc22 CURA-5035 UI pretty much built 2018-03-29 16:52:28 +02:00
fieldOfView
3a9371837c Merge branch 'master' into feature_separate_stage_qml 2018-03-29 14:47:58 +02:00
fieldOfView
272796fd95 Prevent QML warning 2018-03-29 14:46:33 +02:00
fieldOfView
07e1a21aeb Remove prepare items from Monitor stage 2018-03-29 14:46:11 +02:00
Diego Prado Gesto
b2950eca51 CURA-5158 Fix some mistakes in previous confict fixing. 2018-03-29 14:37:55 +02:00
fieldOfView
b5de9c7501 Remove print monitor from Prepare sidebar 2018-03-29 14:35:32 +02:00
fieldOfView
a11bf31ce6 Use separate QML files for prepare and monitor stage 2018-03-29 13:47:46 +02:00
Ghostkeeper
b30df14073
Merge branch '3.3' 2018-03-29 08:55:06 +02:00
Ghostkeeper
cff32b63b5
Update translation files from template
This puts all the new translations among the old translations in our translation files.

Contributes to issue CURA-5166.
2018-03-29 08:53:16 +02:00
Ghostkeeper
853b5b8971
Update translation templates
These are the translation templates for Cura 3.3.

Contributes to issue CURA-5166.
2018-03-29 08:48:34 +02:00