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

16406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
5701f64d14
Merge branch 'update_translations_3.6' into 3.6 2018-11-06 17:15:22 +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
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
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
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
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
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
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
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
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
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
Ghostkeeper
a5c2a73487
Fix adhesion type checkbox if default is skirt 
The remove-unused-values feature doesn't work with settings that are resolved, because we try to remove them at the appropriate position in the stack but then we check at that position in the stack if the value is not the same as what it was, but with this check the resolve function is no longer evaluated. It's complex, but hard to solve because we can't try to remove it at this location and predict that this will change the actual final value after the resolve function has done its thing.

Contributes to issue CURA-5877.
 2018-10-31 13:09:15 +01:00
Remco Burema
5cb72e298d
Merge pull request #4700 from Ultimaker/CURA-5873_fix_duplicated_generic_materials 
Fix duplicated generic materials
 2018-10-31 11:47:09 +01:00
Ian Paschal
7960772ac8 Do show "delete" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:46:19 +01:00
Ian Paschal
ac7a566ae1 Do not show "move to top" on print jobs waiting for configuration change 
Contributes to CL-1118
 2018-10-31 11:45:30 +01:00
Diego Prado Gesto
843cb9e09c Merge branch '3.6' of github.com:Ultimaker/Cura into 3.6 2018-10-31 11:32:18 +01:00
Diego Prado Gesto
3548f9f23c Fix typo in the bundled packages. 2018-10-31 11:31:05 +01:00
Ian Paschal
903054190d Fixing some spacing issues with camera button 
Contributes to CL-1063
 2018-10-31 11:23:57 +01:00
Lipu Fei
d5806d145d
Merge pull request #4690 from Ultimaker/rename_ToolBox_to_Marketplace 
Rename user visible entries of ToolBox to Marketplace
 2018-10-31 10:42:27 +01:00
Diego Prado Gesto
3e37f2a09d Reset the list of generic materials to emtpy when creating the models. 
Contributes to CURA-5873.
 2018-10-31 10:31:20 +01:00
Diego Prado Gesto
2c7e7a4ad7 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:47:33 +01:00
Diego Prado Gesto
33da50df26 Rename other entries of the Toolbox to Marketplace. 
Add a line in the Changelog indicating that the Toolbox was renamed.

Contributes to CURA-5874.
 2018-10-31 09:45:29 +01:00
Remco Burema
e887c260ab Add contributors to printer-defs section in the 3.6-changelog. 
part of [CURA-5871] Release notes Cura 3.6 Beta
 2018-10-31 09:30:41 +01:00
Diego Prado Gesto
e2254fe039 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:20:38 +01:00
Remco Burema
bae491ae7d Merge branch 'CURA-5839_cc06' into 3.6 2018-10-30 16:08:50 +01:00
Lipu Fei
0068dc81b1 Update bundled material packages due to CC 0.6 
CURA-5839

 - Update bundled material package versions which has material profiles
   updated due to CC 0.6
 - Fix sdk_versions by changing them to 5
 - Add bundled material packages for new materials for CC 0.6
 2018-10-30 15:15:07 +01:00
Simon Edwards
03dd26e6e2
Merge pull request #4692 from Ultimaker/monitor_tab_spacing_improvements 
Monitor tab spacing improvements
 2018-10-30 14:57:18 +01:00
Simon Edwards
839f1f2adc
Merge pull request #4691 from Ultimaker/CL-1118_no_context_menu_on_finished_jobs 
CL-1118 Don't show the context menu for printed jobs
 2018-10-30 14:37:16 +01:00
Ian Paschal
30c7a2cbe5 Monitor tab spacing improvements 
Fixing CL-1063 (adding camera button at all times) introduced a few small spacing issues. This PR fixes them.
 2018-10-30 13:58:42 +01:00
Ian Paschal
0273cd2a0e Don't show the context menu for printed jobs (only active ones and queued ones) 
Contributes to CL-1118
 2018-10-30 13:44:24 +01:00
Ian Paschal
1680548a39 Remove extra empty line 2018-10-30 13:36:52 +01:00
Lipu Fei
09e7603dd6 Update nozzle_id to CC Red 0.6 
CURA-5839
 2018-10-30 12:28:58 +01:00
Simon Edwards
d64465ca48
Merge pull request #4689 from Ultimaker/CL-1063_always_show_camera_monitor 
CL-1063 Always show camera icon in monitor tab
 2018-10-30 11:49:58 +01:00
Ghostkeeper
ab7f69bc1b
Add change log for Cura 3.6 
Implements CURA-5871.
 2018-10-30 11:10:45 +01:00
Lipu Fei
f0fa03c3ce Add CC 0.6 for UM S5 
CURA-5839
 2018-10-30 10:58:40 +01:00
Ian Paschal
adac66b3f7 Always show camera icon in monitor tab 
Contributes to CL-1063
 2018-10-30 10:53:43 +01:00
Ghostkeeper
e2b6a3f411
Add white background to thumbnails 
Regardless of the theme, the thumbnail should always have a white background so that the author can base their colours on that. Also this properly renders transparent images with a white background so that the Ultimaker robot is visible again in the dark theme.
 2018-10-30 10:39:29 +01:00