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

16540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
2d59ca02ca Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 16:59:07 +01:00
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
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
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
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
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
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
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
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
Ian Paschal
4f10b7809a Configuration override improvements 
Contributes to CL-1124
 2018-11-05 12:15:17 +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
Jaime van Kessel
e2a166ca83 Merge branch 'master' of github.com:Ultimaker/Cura 2018-11-02 16:14:37 +01:00
Diego Prado Gesto
a39449c48b
Merge pull request #4704 from Ultimaker/CURA-5842_update_update_text 
CURA-5842 Set CuraApplication display name
 2018-11-02 16:03:10 +01:00
Diego Prado Gesto
b6e35df030
Merge pull request #4709 from fieldOfView/fix_add_printer_layout 
Add Printer dialog codestyle and readability
 2018-11-02 15:29:32 +01:00
Jaime van Kessel
de8e56ae19 Merge branch 'feature_support_interface_offset' of https://github.com/DesktopMetal/Cura 2018-11-02 15:21:39 +01:00
Jaime van Kessel
ac9cfd8873 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-11-02 13:39:05 +01:00
Jaime van Kessel
300d109cfe Set the Z of the machine selector so the tooltip doesn't get hidden 
CURA-5772
 2018-11-02 13:37:57 +01:00
Diego Prado Gesto
53872f9a5b Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-02 13:36:47 +01:00
Ghostkeeper
2852674499
Adjust state of API call 
It can just be an arbitrary string, as long as it is kept consistent I suppose.

Discovered during test of CURA-5784.
 2018-11-01 15:50:18 +01:00
Jaime van Kessel
90726ecbff Fix situation where the setting visibility model could cause a crash. 
Yay for crash logging
 2018-11-01 15:28:08 +01:00
Ghostkeeper
bd97aed1c7
Merge branch '3.6' 2018-11-01 14:43:47 +01:00
Ghostkeeper
4dc248a631
Rename Open Marketplace to just Marketplace 
Because Open Marketplace has to be translated (the 'open' part) but the Marketplace can just be called marketplace.

Contributes to issue 5870.
 2018-11-01 14:43:22 +01:00
fieldOfView
e61a6e7a5c Fix codestyle 2018-11-01 14:41:33 +01:00
Diego Prado Gesto
dcad95aab9 Rename Toolbox button to Marketplace. 
Contributes to CURA-5784.
 2018-11-01 12:44:14 +01:00
Lipu Fei
ff4dfcf9a6 Make Cura app display name configurable 
CURA-5842
 2018-11-01 12:15:00 +01:00
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Diego Prado Gesto
9215bb11f0 Merge branch '3.6' 2018-11-01 09:11:20 +01:00
Diego Prado Gesto
e884605cc3 Fix typo. 2018-11-01 08:47:44 +01:00
Lipu Fei
cb24549d7d Set CuraApplication display name 
CURA-5842
 2018-11-01 08:29:54 +01:00
Jaime van Kessel
6256e3f24b Merge branch 'feature_add_printer_layout' of https://github.com/fieldOfView/Cura 2018-10-31 14:23:42 +01:00
Ian Paschal
1ba8eff7fa Don't show camera icon unless printer details are expanded 
Contributes to CL-1063
 2018-10-31 13:52:31 +01:00