3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
14010 commits 342 branches 300 tags 748 MiB
Commit graph

6139 commits

Author SHA1 Message Date
Ian Paschal
9b556e9c86 CURA-5035 Removed all base units 2018-04-20 14:08:44 +02:00
Ian Paschal
668a92952c CURA-5035 Review changes 2018-04-20 13:26:23 +02:00
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Lipu Fei
c0db82e7a3 Merge remote-tracking branch 'origin/3.3' 2018-04-17 11:18:27 +02:00
Lipu Fei
a111dda82e Revert "Custom qualities are always checkable" 
CURA-5218

This reverts commit fdd7807769.
 2018-04-17 11:14:14 +02:00
DavidGergely
dd2d365884 Revert "PC top-bottom speed changed to function based" 
This reverts commit cec7b8691d.
 2018-04-16 16:40:35 +02:00
DavidGergely
cec7b8691d PC top-bottom speed changed to function based 
PC top-bottom speed in all layer heights for the 0.4 mm printcore
changed to function based.
 2018-04-16 16:39:34 +02:00
Ghostkeeper
455abb15bf
Consistently use capital letters for CLI settings too 
They're not actually visible, but in case they are made visible by modifying the preferences file...
 2018-04-16 12:36:17 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Ghostkeeper
db09272b1e
Corrections for Bothof translations 
These are corrections for the mistakes that we found in Bothof's translations.

Thanks to Vandrasc and Ellecross.

Contributes to issue CURA-5166.
 2018-04-13 16:13:17 +02:00
Ghostkeeper
479e260833
Correct formatting of string starting with \n 
Gettext doesn't accept this, even though it's correct.

Contributes to issue CURA-5166.
 2018-04-13 15:28:53 +02:00
Ghostkeeper
1488f965b7
Scale height of slider hover area with screenScaleFactor 
This way it scales along with the high-resolution screen scaling for high-DPI screens.
 2018-04-13 11:43:43 +02:00
Jaime van Kessel
5d1d426037 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-12 21:56:13 +02:00
Jaime van Kessel
dc935e2698 Added unit to adaptive layer height settings 2018-04-12 21:55:51 +02:00
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
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
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
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
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
Ian Paschal
f63e67dc22 CURA-5035 UI pretty much built 2018-03-29 16:52:28 +02:00
Diego Prado Gesto
b2950eca51 CURA-5158 Fix some mistakes in previous confict fixing. 2018-03-29 14:37:55 +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
Ian Paschal
138fc668a7 CURA-5035 First draft 2018-03-28 17:10:22 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container 
changes and output devices change.
 2018-03-28 11:07:48 +02:00