3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 12:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
18800 commits 306 branches 270 tags 779 MiB
Commit graph

8170 commits

Author SHA1 Message Date
Diego Prado Gesto
dbd30abd86 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-20 17:06:09 +02:00
Diego Prado Gesto
b8a26f3187 CURA-5218 Disable the Activate and Duplicate button in the management 
page if the selected profile is not supported
 2018-04-20 17:04:51 +02:00
Ghostkeeper
ac2301a8fd
Fix code style: Brackets on new line 
And one comma without a space after it.

Contributes to issue CURA-5204.
 2018-04-20 15:36:32 +02:00
Ghostkeeper
e13c3b1f13
Merge branch '3.3' 2018-04-20 15:34:06 +02:00
Ghostkeeper
f675b0b858
Fix 'Setting up scene...' translation 
This was replaced with its English term, even though it's not really an industry term or anything.

Contributes to issue CURA-5166.
 2018-04-20 15:33:48 +02:00
Lipu Fei
d0c6d87417 Fix Rigid3D Mucit definition 
CURA-5257

 - Remove extra trailing spaces
 - Replace TABs with SPACEs
 - "value"s should use quotes ""
 2018-04-20 14:52:52 +02:00
Lipu Fei
addcf5236a
Merge pull request #3642 from Rigid3D/master 
Printer Definitions for Rigid3D Mucit
 2018-04-20 14:43:58 +02:00
Ghostkeeper
70aed244ca
Merge branch '3.3' 2018-04-20 14:36:51 +02:00
Ghostkeeper
74016f0fb3
Merge branch 'jbkim-3.3' into 3.3 2018-04-20 14:19:03 +02:00
Ghostkeeper
132efba272
Undo some of the changes that we thought were wrong 
In these cases we trust the original translation of Bothof better.

Contributes to issue CURA-5166.
 2018-04-20 14:18:45 +02:00
Diego Prado Gesto
576881bfeb CURA-5204 Update the checkbox if the setting has changed in the 'More 
information' dialog.
 2018-04-20 14:12:05 +02:00
Ian Paschal
9b556e9c86 CURA-5035 Removed all base units 2018-04-20 14:08:44 +02:00
Diego Prado Gesto
122b5e36cf CURA-5204 Revert a change since it sets the setting to false if the 
panel is not visible.
 2018-04-20 13:36:07 +02:00
Ghostkeeper
1578a76aa4
Merge branch '3.3' of https://github.com/jbkim/Cura into jbkim-3.3 2018-04-20 13:32:48 +02:00
Ghostkeeper
d2caeee8c1
Clarify warning for filament diameter change 
It's the diameter of the filament, not the diameter of the material. Diameter of a material doesn't make any sense. Also corrected grammar and clarified context.
 2018-04-20 13:32:14 +02:00
Ian Paschal
668a92952c CURA-5035 Review changes 2018-04-20 13:26:23 +02:00
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