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

16749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
bd5df72116
Merge branch '3.6' 2018-11-06 16:10:02 +01:00
Ghostkeeper
bca3af16e0
Merge branch 'Patola-3.6' into 3.6 2018-11-06 16:09:45 +01:00
Ghostkeeper
9fa9c04517
Fix translation mistakes found in Cura 3.6 
These mistakes were found in the translations. In many cases it makes the text closer to the original rather than more consistent with the environment. If the environment is inconsistent then we should fix the original string in our source code rather than in the translations.

Contributes to issue CURA-5870.
 2018-11-06 16:07:41 +01:00
Ghostkeeper
8ef8639e29
Merge branch '3.6' of https://github.com/Patola/Cura into Patola-3.6 2018-11-06 16:06:50 +01:00
Ghostkeeper
52c2723990
Make corrections to translation mistakes 
These are all the mistakes that we found in the translations to Cura 3.6.

Contributes to issue CURA-5870.
 2018-11-06 16:03:00 +01:00
Diego Prado Gesto
27e2cc8dc5
Merge pull request #4742 from Ultimaker/CURA-5899_fix_custom_quality_handling_in_project_loading 
[3.6] [CURA-5899] Fix quality changes lookup in project loading
 2018-11-06 15:55:56 +01:00
Lipu Fei
ef3bb044f4 Rename CC Red 0.6 to CC 0.6 2018-11-06 15:31:51 +01:00
Diego Prado Gesto
5dddcbd666 Add a new property to the ActionButton to indicate whether the button 
has a fixed width or the width will be dependant on the content.

Contributes to CURA-5786.
 2018-11-06 15:14:27 +01:00
Diego Prado Gesto
b6b60702c0 Make the action panel to have a fixed width. Remove the animations when 
switching states.

Contributes to CURA-5786.
 2018-11-06 14:32:48 +01:00
Lipu Fei
3db85b2493 Try to strip extra curaproject extensions 
CURA-5896
 2018-11-06 13:48:22 +01:00
Ghostkeeper
d3ace436e6
Update translations for some more languages 
Russian, Turkish and Chinese.

Contributes to issue CURA-5870.
 2018-11-06 13:33:48 +01:00
Lipu Fei
8e33a19ca7 Fix quality changes lookup in project loading 
CURA-5899

Should always use custom quality profile names to look up.
 2018-11-06 13:31:04 +01:00
Ghostkeeper
e45924b6fb
Update translations for some languages 
German, Spanish, French, Italian, Japanese, Korean, Dutch and European Portuguese.

Contributes to issue CURA-5870.
 2018-11-06 13:30:09 +01:00
Ghostkeeper
b0384bf10e
Update Taiwanese translations 
These were e-mailed to me by the volunteer translator, @Dinowchang.

Contributes to issue CURA-5870.
 2018-11-06 13:15:02 +01:00
Lipu Fei
0af9216c75 Remove deprecated setup.py 2018-11-06 12:29:25 +01:00
Lipu Fei
ce517f1517 Merge from 3.6 2018-11-06 11:26:09 +01:00
Diego Prado Gesto
f41ae128c2 Modify alignments to avoid binding loop logs. 
Contributes to CURA-5786.
 2018-11-06 11:24:41 +01:00
Lipu Fei
fad8ad5d47
Merge pull request #4730 from Ultimaker/CURA-5898-duplicating-material-results-in-not-supported-warning 
Make quality manager also include profiles with same GUID in fallback.
 2018-11-06 11:23:10 +01:00
Jaime van Kessel
11a3da3068 Removed color animation from stage buttons 
This caused laggy updates and it didn't add that much anyway

CURA-5772
 2018-11-06 11:06:20 +01:00
Lipu Fei
9c9e81b30c Move InstanceContainer import into type checking closure 
CURA-5898
 2018-11-06 11:04:18 +01:00
Ghostkeeper
01923dfba4
Reduce resolution of heavy build plate meshes 
These were way above our guideline of 1MB per build plate mesh file. I've used the decimate function in Blender. It looks more or less the same. The resolution of the embossed lettering in these is slightly less but you really have to look for it.
 2018-11-06 11:00:11 +01:00
Simon Edwards
6304dde5a9 Merge branch 'CL-1124_configuration_override_improvements' into 3.6 2018-11-06 10:19:32 +01:00
Jaime van Kessel
8117c087aa Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-11-06 09:52:22 +01:00
Jaime van Kessel
317447aa54 Fix multi-buildplate panel location 
CURA-5772
 2018-11-06 09:52:01 +01:00
Diego Prado Gesto
f1f1b9f168 Center icon an label vertically. 
Contributes to CURA-5786.
 2018-11-06 09:45:40 +01:00
Diego Prado Gesto
257d482184 Merge branch 'cura4.0_header' into cura4.0_action_panel 2018-11-06 09:23:39 +01:00
Diego Prado Gesto
18c9e9f05a Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 09:23:15 +01:00
Jaime van Kessel
08917c37a1 Improve rendering of scaled avatar image 
CURA-5772
 2018-11-06 09:21:27 +01:00
Jaime van Kessel
9f246910bc Make avatar image border a bit wider 
This prevents a white edge from showing

CURA-5772
 2018-11-06 09:18:20 +01:00
Cláudio 'Patola' Sampaio
ee2a34d647 Updated pt_BR strings for 3.6 2018-11-06 04:44:05 -02:00
Jaime van Kessel
93467dc29f Ensure that weeding out the duplicates doesn't mess up the order 
CURA-5898
 2018-11-05 17:33:12 +01:00
Ian Paschal
c84aa9cf21 Use default font for configuration override 
Contributes to CL-1124
 2018-11-05 17:19:22 +01:00
Jaime van Kessel
319d52a2f9 Make collapsible simulation view collapse to right height 
CURA-5829
 2018-11-05 16:59:06 +01:00
Jaime van Kessel
8106df1ae2 Bit of QML cleanup 2018-11-05 16:45:12 +01:00
Ian Paschal
1abd0b3499 Show "Pausing...", "Aborting...", and "Resuming..." texts 
Contributes to CL-1126
 2018-11-05 15:45:17 +01:00
Ghostkeeper
e2e08879d7
Merge branch '3.6' 2018-11-05 15:42:06 +01:00
Jaime van Kessel
99bac25ab2 Show default avatar if user has no avatar picture set 
CURA-5784
 2018-11-05 14:55:22 +01:00
Lipu Fei
3f1e0cc610 Fix delayed convex hull recomputation 
CURA-5896

If the current tool operation is still active, we need to delay the
convex hull recomputation after the tool becomes inactive.
 2018-11-05 14:25:18 +01:00
Lipu Fei
93afaf64c6 Strip the old "curaproject" extension from project name 
CURA-5896
 2018-11-05 13:28:21 +01:00
Jaime van Kessel
2bb7b352ef Hide settings when pre-sliced g-code is loaded 
CURA-5772
 2018-11-05 13:25:47 +01:00
Lipu Fei
88f3325972 Add typing for _createMaterialOutputModel() 
CURA-5887
 2018-11-05 13:11:58 +01:00
Ian Paschal
4f10b7809a Configuration override improvements 
Contributes to CL-1124
 2018-11-05 12:15:17 +01:00
Jaime van Kessel
406dd68aa4 Made path slider widht themable. 
CURA-5829
 2018-11-05 11:54:55 +01:00
Lipu Fei
fa693aef2b Fix material shown in print jobs 
CURA-5887

 - Use MaterialManager to get materials
 - For a GUID with mulitple matches, show the read-only materials first
   if any. Otherwise, show non-read-only materials.
 2018-11-05 11:48:19 +01:00
Jaime van Kessel
9f13de9f0d No longer create two instances of the setting view. 
This caused a bunch of issues with the getPluginId, as one of the instances
didn't got added to the registry (and as such, never got an ID)

CURA-5829
 2018-11-05 11:48:19 +01:00
Jaime van Kessel
f0e205423f Pause simulation view when preferences have been changed. 
I accidentally removed this feature when working on CURA-5829, but
it was spotted in the review.
 2018-11-05 11:47:22 +01:00
Jaime van Kessel
4659b0d387 Fix codestyle 2018-11-05 11:36:58 +01:00
Jaime van Kessel
412e5977a6 Fix type issues 2018-11-05 11:30:02 +01:00
Jaime van Kessel
eded0f0297 Make quality manager also include profiles with same GUID in fallback. 
This ensures that if a (duplicated) material does not have a generic variant, that
the material it was copied from will be added to the fallback list.

CURA-5898
 2018-11-05 11:17:39 +01:00
Ghostkeeper
a0295786b0
Remove unused installer.nsi 
It won't work any more anyway.
Please use https://github.com/Ultimaker/cura-build to create an installer for Cura.
 2018-11-05 09:44:41 +01:00