GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 14:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,099 Commits 295 Branches 268 Tags
Commit Graph

14099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Lipu Fei
53495604f8 Merge remote-tracking branch 'origin/feature_show_config_errors' 2018-04-19 15:38:29 +02: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
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00
Lipu Fei
f24e1da934 Always update job name for gcode files 
CURA-5246
 2018-04-19 09:17:22 +02:00
Jinbuhm Kim
0a5f1878b7 Update Korean translation for Cura 3.3 2018-04-19 16:13:40 +09:00
Lipu Fei
d56e726507
Merge pull request #3685 from Ultimaker/fix_support_eraser_3.3 
[3.3] Fix support eraser
 2018-04-19 08:34:24 +02:00
fieldOfView
57404deba6 Prevent scaling support eraser with scaled parent 2018-04-19 08:32:50 +02:00
fieldOfView
a52eaa98f1 When multiplying a parented node, multiply the parent instead (like groups) 2018-04-19 08:32:50 +02:00
fieldOfView
ea6d4d96f9 Exclude non-printing-meshes from bounding box of parents 
Non-printing-meshes inside a group should not affect push apart or drop to build plate
 2018-04-19 08:32:50 +02:00
fieldOfView
0e85802f9c Only respond to left mouse button 2018-04-19 08:32:50 +02:00
Jinbuhm Kim
76211fc07b Fix and add Korean translation 2018-04-19 12:31:13 +09:00
Diego Prado Gesto
9a389bdcdd Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-18 16:55:18 +02:00
Diego Prado Gesto
ee359571c0 CURA-5246 Start the timer for updating the platform activity also when 
the node that changed is a GCode, that has layer data.
 2018-04-18 16:53:33 +02:00
Lipu Fei
2ba7a6e462 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc.

CURA-5228
 2018-04-18 16:00:08 +02:00
Lipu Fei
9e7c417801 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc.

CURA-5228
 2018-04-18 15:59:28 +02:00
Lipu Fei
e7ec767cb7
Merge pull request #3545 from fieldOfView/fix_support_eraser_related 
[3.3] Support Eraser related fixes
 2018-04-18 15:14:44 +02:00
Lipu Fei
340916179a Small typo fixes for preheat timeout 
CURA-5227
 2018-04-18 12:00:50 +02:00
Lipu Fei
dc52678c05
Merge pull request #3620 from fieldOfView/fix_preheat_end_during_print 
[3.3] Prevent preheat timeout from occurring during a print
 2018-04-18 11:59:54 +02:00
Lipu Fei
64274b78b0
Merge pull request #3675 from Ultimaker/PC_setting_changes 
PC profile adjustment
 2018-04-18 11:28:47 +02:00
Lipu Fei
372419c223 Fix fallback quality setting 
CURA-5218
 2018-04-18 11:24:09 +02:00
Lipu Fei
650638fcdd Fix setting default quality 
CURA-5218
 2018-04-18 11:20:43 +02:00
Lipu Fei
7326ee8c40 Fix typo 
CURA-5218
 2018-04-18 11:19:04 +02:00
Lipu Fei
bae1d2a59d Switch to a default quality if the specified is not available 
CURA-5218
 2018-04-18 11:16:19 +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
Lipu Fei
1fefc05698 Fix UM2 custom profile upgrade from 2.7 
CURA-5218
 2018-04-18 10:54:54 +02:00
Ghostkeeper
c49f912276
Merge branch '3.3' 2018-04-18 10:43:31 +02:00
Ghostkeeper
2f14274b87
Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-18 10:41:17 +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
Lipu Fei
1d4a70e839 Show all quality_changes on the quality management page 
CURA-5218
 2018-04-18 10:35:53 +02:00
Lipu Fei
83c728c89e Update job name when pre-sliced flag changes 
CURA-5246
 2018-04-18 10:24:58 +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
Lipu Fei
4d3acddfa4 Update text and fix qml code styles 
CURA-5024
 2018-04-17 16:08:43 +02:00