3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-23 02:41:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
28475 commits 341 branches 300 tags 735 MiB
Commit graph

12854 commits

Author SHA1 Message Date
Diego Prado Gesto
121d1806be Don't show the corresponding element in the general preference panel 
if the related plugin is not enabled.
Contributes to CURA-5204
 2018-04-20 11:56:59 +02:00
Diego Prado Gesto
fc1eef2b0c Merge branch '3.3' 2018-04-20 11:43:49 +02:00
Diego Prado Gesto
4e53f219f0 Merge branch 'master' into CURA-5204_send_anonymous_data 2018-04-20 10:35:52 +02:00
Diego Prado Gesto
f003adeb1e CURA-5250 Add color to the text so it also works fine with other themes. 2018-04-20 10:19:25 +02:00
kerog777
52d2057e64 Add profile data for Felix Tec4 
Includes 2 extruder definitions, platform mesh, and variants for 0.25,
0.35, 0.5, and 0.7 mm nozzles
 2018-04-19 08:24:45 -07:00
Diego Prado Gesto
5567d6f168 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-19 10:24:04 +02:00
Diego Prado Gesto
cdc297c87e CURA-5250 Temporary hide buildplate selector. 
Put back again when the whole feature is ready.
 2018-04-19 10:23:01 +02:00
Diego Prado Gesto
62b586a6ff CURA-5250 Add hint when the buildplate is just usable but not the 
recommended.
 2018-04-19 10:21:19 +02:00
Lipu Fei
94b2209b49 Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:40:30 +02:00
Lipu Fei
aab87a5558
Merge pull request #3584 from ohrn/zyyx 
Add ZYYX Agile printer.
 2018-04-19 09:38:19 +02:00
Jinbuhm Kim
0a5f1878b7 Update Korean translation for Cura 3.3 2018-04-19 16:13:40 +09:00
Jinbuhm Kim
76211fc07b Fix and add Korean translation 2018-04-19 12:31:13 +09:00
Lipu Fei
64274b78b0
Merge pull request #3675 from Ultimaker/PC_setting_changes 
PC profile adjustment
 2018-04-18 11:28:47 +02:00
Ghostkeeper
7ce7b53098
Merge branch '3.3' of https://github.com/jbkim/Cura into jbkim-3.3 2018-04-18 11:03:28 +02:00
Ghostkeeper
c49f912276
Merge branch '3.3' 2018-04-18 10:43:31 +02:00
Ghostkeeper
f19b717503
Corrections to Polish translations 
One small correction that seems to have been a typo (and the header wasn't up to date yet).

Contributes to issue CURA-5166.
 2018-04-18 10:40:49 +02:00
Ghostkeeper
921ef993c7
Update Polish translations for Cura 3.3 
These are the translations received from Anraf1001, the unmodified files.

Contributes to issue CURA-5166.
 2018-04-18 10:37:39 +02:00
Ghostkeeper
b8920b290f
Merge branch '3.3' 2018-04-18 09:47:06 +02:00
Ghostkeeper
407b453ba5
Corrections to European Portuguese translation 
These corrections are necessary to make the text fit better.
 2018-04-18 09:41:54 +02:00
Ghostkeeper
d28c94a000
Make corrections from Utopica3D 
Paulo made a bunch of corrections to our European Portuguese translation. These are his files.

Contributes to issue CURA-5166.
 2018-04-18 09:40:23 +02:00
Lipu Fei
35e7be1d41 Use pyqtSlot to show more info dialog 
CURA-5204
 2018-04-17 16:43:41 +02:00
Lipu Fei
0d5b21932e Use "More information" for button 
CURA-5204
 2018-04-17 16:13:13 +02:00
Ghostkeeper
c4b15b02d4
Merge branch '3.3' 2018-04-17 14:32:15 +02:00
Ghostkeeper
1b173e8119
Correct translation of 'Affects' 
Apparently 'touché' means something more like a human touching it, rather than something affecting something else.

Fixes #3489.
 2018-04-17 14:32:02 +02:00
Ghostkeeper
0f39b36bd6
Correction to French translation of 'Hollow Out Objects' 
Fixes #3489.
 2018-04-17 14:30:08 +02:00
Ghostkeeper
e43e9ad117
Merge branch '3.3' 2018-04-17 13:56:46 +02:00
Ghostkeeper
b744302557
Merge branch 'M&P-Setting-Optimization' into 3.3 2018-04-17 13:56:11 +02:00
Ghostkeeper
d13fa3a6aa
Merge branch '3.3' 2018-04-17 11:40:29 +02:00
Ghostkeeper
4c75d78f26
Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-17 11:36:45 +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
61eba07c50 PC profile adjustment 
PC top bottom speed for the 0.4 printcore adjusted to have formula
 2018-04-16 16:45:42 +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
Jinbuhm Kim
23fdd5f1e6 Fix and update Korean Translation 2018-04-16 17:27:33 +09:00
Unknown
42d3235e91 refine translation for 'overhang' 2018-04-13 22:27:21 +08:00
Unknown
172a197cbf update fdmprinter.def.json.po for cura 3.3 (2) 2018-04-13 22:27:12 +08:00
Unknown
6a233ccd41 refine translation of 'visibility' 2018-04-13 22:27:07 +08:00
Unknown
e944d5f78e update cura.po for cura 3.3 (2) 2018-04-13 22:27:03 +08:00
Unknown
003c4831ea update cura.po for cura 3.3 (1) 2018-04-13 22:26:51 +08:00
Unknown
929de409ce update fdmprinter.def.json.po for cura 3.3 (1) 2018-04-13 22:26:46 +08:00
Unknown
b4802fa3a1 update fdmextruder.def.json.po for cura 3.3 2018-04-13 22:26:41 +08:00
Unknown
c5c4ae093a refine old translation 2018-04-13 22:26:23 +08: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