GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 14:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,815 Commits 289 Branches 260 Tags
Commit Graph

8156 Commits

Author SHA1 Message Date
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Ghostkeeper
12b58feb51
Minor corrections to Brazilian translations 
Contributes to issue CURA-6257.
 2019-03-18 11:24:08 +01:00
Cláudio 'Patola' Sampaio
a286863e27
Update translation strings for Cura 4.0 2019-03-18 11:20:20 +01:00
THeijmans
fdf65b43bc Update the speed values for the um2+ 
Some more wrong values were found, these should be fixed with this pull request
 2019-03-14 15:59:12 +01:00
Jaime van Kessel
f73dabdc3f Merge branch 'UM2plus-profile-speed-issues' of github.com:Ultimaker/Cura 2019-03-14 15:58:36 +01:00
THeijmans
83352e14e9 Update the speed values for the um2+ 
Some more wrong values were found, these should be fixed with this pull request
 2019-03-14 15:38:42 +01:00
Ghostkeeper
0f8a30d37b
Add period to tooltip sentence 
A lot of translators got this wrong.

Contributes to issue CURA-6257.
 2019-03-14 14:30:57 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Ghostkeeper
8e81847fa7
Use periods instead of ellipses 
Because some printers don't accept non-ANSI characters and will stop printing when they encounter one.
 2019-03-13 15:43:58 +01:00
Jaime van Kessel
208e5d3616 Fixed incorrect version numbers 2019-03-13 15:34:33 +01:00
Ghostkeeper
cfa02c39ec
Don't allow translating 'Ultimaker Cloud' 
It is a marketing name and shouldn't be translated then.

Contributes to issue CURA-6257.
 2019-03-13 14:29:07 +01:00
Ghostkeeper
04f11e4abf
Make translation a bit easier to get grammatically correct 
We should not append translations to each other. That doesn't work in different languages.

Contributes to issue CURA-6257.
 2019-03-13 14:13:49 +01:00
Jaime van Kessel
31c57d0113
Merge pull request #5374 from ValentinPitre/add_tizyx_evy_dual_profile 
Add TiZYX Evy Dual Extruder 3D printer
 2019-03-13 14:12:15 +01:00
THeijmans
e33ec5c324 Fixing the UM2+ speeds 
Fixing the very high print speeds in UM2+ profiles
 2019-03-11 17:35:23 +01:00
THeijmans
02fc942ac8 Fixing the UM2+ speeds 
Fixing the very high print speeds in UM2+ profiles
 2019-03-11 14:42:10 +01:00
Ghostkeeper
f9b91df034
Update setting_version to 7 
For these profiles it was somehow outdated.
 2019-03-11 11:52:42 +01:00
Jaime van Kessel
0616601250 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-11 10:39:23 +01:00
ValentinPitre
da044daaeb
Remove 2.85 diameter filaments from "exclude_materials" 2019-03-10 15:26:18 +01:00
Diego Prado Gesto
0286c701fd Change setting_version to be the same as in current master 
Also change the profiles to act as global profiles and fix indentation.

Contributes to CURA-6080.
 2019-03-08 17:00:17 +01:00
Diego Prado Gesto
c62bfc8ece Merge branch '4.0' of https://github.com/BluefireXD/Cura into BluefireXD-4.0 2019-03-08 16:48:56 +01:00
Diego Prado Gesto
d53c8b1162 Change text to singular mode 
It makes more sense.
 2019-03-08 15:27:17 +01:00
Ghostkeeper
20fc26b8ba
Correct setting version for definition files 
Otherwise the container provider actually rejects loading it completely.

Contributes to issue CURA-6270.
 2019-03-08 13:32:36 +01:00
kaleidoscopeit
7f3abbd717 Deltacomb 3D - Updated profile 2019-03-07 17:17:02 +01:00
kaleidoscopeit
473e8efac0 Deltacomb 3D - Updated profile 2019-03-07 17:06:49 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
ValentinPitre
f4a20b35a6
Update tizyx_evy_dual.def.json 2019-03-06 14:43:07 +01:00
Ghostkeeper
380d8ce0c2
Merge branch 'afinkle-master' 2019-03-06 14:23:15 +01:00
Lipu Fei
4979b401b3 Disable prime blob by default for CFFF 
CURA-6282
 2019-03-06 11:02:55 +01:00
Ghostkeeper
76d9503777
Replace travel_speed with speed_travel 
The setting key was renamed in version 15.6.
 2019-03-05 17:43:00 +01:00
Ghostkeeper
0fe9e660b1
Don't show Silicone for UM printers that are incompatible with it anyway 
It's still an open bug that we show materials of which all configurations are incompatible with the printer.

Contributes to issue CURA-6262.
 2019-03-05 15:36:31 +01:00
Ghostkeeper
df8d060a00
Increment setting_version 
This must be up-to-date with the setting version that Cura currently uses, in order to ensure that the settings have the same names and the same functionality.
The settings that are set by these profiles are all nozzle-dimensional settings that haven't changed since 3.5, so we don't need to actually change the settings right now.

Contributes to issue CURA-6262.
 2019-03-05 14:37:45 +01:00
Ghostkeeper
c665a481dd
Show settings that influence draft/ooze shields if enabled 
The skirt/brim speeds currently affect the draft and ooze shields. So if the draft or ooze shield is enabled, show those settings.

Contributes to #5373.
 2019-03-05 10:45:25 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Ghostkeeper
180156da78
Correct whitespace 
Change tabs to spaces according to our style standards. And remove a bunch of unnecessary white lines to make it easier to read.
 2019-03-01 11:45:08 +01:00
ValentinPitre
ca2be26463 Add TiZYX Evy Dual Extruder 3D printer 2019-03-01 00:34:45 +01:00
Mark
eccfebf39d Update material packages for 4.0 release 2019-02-28 16:11:51 +01:00
Andrew Finkle
5581cd5c2c Added definition, extruder, material, and variants for Discov3ry Complete 2019-02-27 11:55:25 -05:00
Andrew Finkle
3f765a9ca2 Revert "Create structur3d_discov3ry1_complete_um2plus.json" 
This reverts commit 05e889621ecaba1eec47216fb5393fd7cfb65ed0.
 2019-02-27 10:29:58 -05:00
Andrew Finkle
05e889621e Create structur3d_discov3ry1_complete_um2plus.json 2019-02-27 10:29:28 -05:00
Ghostkeeper
b723beb435
Pre-heat to initial layer temperature instead of normal temperature 
Because that's what it's going to start printing with.
 2019-02-27 15:58:30 +01:00
Ghostkeeper
970fa69166
Merge branch 'patch-2' of https://github.com/h0x91b/Cura into h0x91b-patch-2 2019-02-27 15:55:57 +01:00
Ghostkeeper
470871a0d2
Merge branch 'master' of https://github.com/radfahrer/Cura into radfahrer-master 2019-02-27 15:31:57 +01:00
Ghostkeeper
1c6cce316a
Merge branch '4.0' 2019-02-27 11:47:47 +01:00
Ghostkeeper
9fba8f5381
Update metadata of translation templates 
It's now 2019, and Cura 4.0.

Contributes to issue CURA-6257.
 2019-02-27 11:47:29 +01:00
Ghostkeeper
c44a207744
Remove duplicate property 
I think this is the result of a merge conflict or something. This entry should not be dependent on the number of bottom layers so I'm keeping the first one.
 2019-02-27 10:23:46 +01:00
Ghostkeeper
e2adc1791f
Merge branch '4.0' 2019-02-26 17:08:30 +01:00
Ghostkeeper
bedb52fb60
Update translation templates for every language 
This way the translators can simply fill in the blanks.

Contributes to issue CURA-6257.
 2019-02-26 16:54:50 +01:00
Ghostkeeper
fbbadc4543
Update translation templates for Cura 4.0 
These are the new strings that will now have to be translated.

Contributes to issue CURA-6257.
 2019-02-26 16:53:34 +01:00
Daniel Green
bfa13e6146 Merge branch 'master' of github.com:radfahrer/Cura 2019-02-26 07:25:42 -08:00