GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 17:45:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,050 Commits 294 Branches 267 Tags
Commit Graph

17050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Edwards
69c9ffaf61
Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor 
CL-1140 Show print time in monitor tab
 2018-11-08 11:53:47 +01:00
Remco Burema
aef5c67652 Merge branch 'cura4.0_action_panel' into cura4.0_header 2018-11-08 11:50:14 +01:00
Ian Paschal
aa6ec9e44b Make text black 
Contributes to CL-1040
 2018-11-08 11:48:22 +01:00
Lipu Fei
de6ab02422 Merge pull request #4678 from fieldOfView/fix_networkprinter_post 
Fix type error in NetworkedPrinterOutputDevice.post
 2018-11-08 11:05:47 +01:00
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post 
Fix type error in NetworkedPrinterOutputDevice.post
 2018-11-08 11:02:57 +01:00
Ian Paschal
35ed234991 Show print time in monitor tab 
Contributes to CL-1040
 2018-11-08 10:49:22 +01:00
Ghostkeeper
d8a1d458cf
Merge branch '3.6' 2018-11-08 09:49:15 +01:00
Ghostkeeper
c5a9c6c6cc
Add translation for missing line in Korean 
This one was not translated.

Contributes to issue CURA-5870.
 2018-11-08 09:48:52 +01:00
Diego Prado Gesto
9f663cfd18 Change the gradient for the LinearGradient that works in the new versions of Qt. 
I also changed it because we had a TODO here and I thought it was the right moment to do it.

Contributes to CURA-5829.
 2018-11-07 17:25:43 +01:00
Jaime van Kessel
f15d03d48c Fix foldout of the layerview panel being too short or too long 
CURA-5829
 2018-11-07 16:30:52 +01:00
fieldOfView
f12efb7aa1 Fix LegacyUM3OutputDevice post() call 2018-11-07 16:07:45 +01:00
Lipu Fei
32cb7a78e8
Merge pull request #4749 from Ultimaker/CURA-5900_remove_CC0.6_PLA_profiles 
Remove quality profiles for PLA in the UMS5 with the CC 0.6 print core.
 2018-11-07 13:52:16 +01:00
Diego Prado Gesto
58a01816aa Remove quality profiles for PLA in the UMS5 with the CC 0.6 print core. 
PLA is compatible with the print core but we don't want to provide
profiles because they were not fully tested.

Contributes to CURA-5900.
 2018-11-07 13:39:06 +01:00
Jaime van Kessel
36a9642c90 Merge branch 'CURA-5887_fix_material_shown_in_print_job' of github.com:Ultimaker/Cura 2018-11-07 12:39:41 +01:00
Jaime van Kessel
68512a2184 Merge branch '3.6' of github.com:Ultimaker/Cura into 3.6 2018-11-07 12:35:25 +01:00
Jaime van Kessel
9a93f6866a Fix crash of toolbox when metadata got corrupted 2018-11-07 12:03:32 +01:00
Diego Prado Gesto
98534533a2 Merge branch '3.6' 2018-11-07 11:27:31 +01:00
Diego Prado Gesto
44ab6dee77
Merge pull request #4748 from Ultimaker/CURA-5900_rename_cc_red_06_to_cc_06 
[3.6] [CURA-5900] Rename "CC Red 0.6" to "CC 0.6"
 2018-11-07 11:21:09 +01:00
Diego Prado Gesto
2c28e931ea Rename CC Red 0.6 to CC 0.6 in the Changelog. 
Contributes to CURA-5900.
 2018-11-07 11:06:40 +01:00
Lipu Fei
982123a04e Update bundled package versions for materials using CC 0.6 2018-11-07 10:32:30 +01:00
Remco Burema
c262635144
Merge pull request #4743 from Ultimaker/CURA-5896_strip_exra_curaproject_extensions 
[3.6] [CURA-5896] Try to strip extra curaproject extensions
 2018-11-07 09:08:39 +01:00
pinchies
70d2f407a3
Update cocoon_create_modelmaker.def.json 2018-11-07 04:38:39 +11:00
pinchies
c51995f349
Update jgaurora_a5.def.json 2018-11-07 04:36:32 +11:00
Remco Burema
94924783b6 Defensive coding: Old file-extensions may have been saved as all-caps. [CURA-5896] 2018-11-06 17:16:29 +01:00
Ghostkeeper
5cbe2da2b4
Merge branch '3.6' 2018-11-06 17:15:54 +01:00
Ghostkeeper
021ae92da8
Merge branch '3.6' of ssh://github.com/Ultimaker/Cura into 3.6 2018-11-06 17:15:36 +01:00
Ghostkeeper
5701f64d14
Merge branch 'update_translations_3.6' into 3.6 2018-11-06 17:15:22 +01:00
Simon Edwards
7ecffdef3d Merge branch 'CL-1126_monitor_tab_context_menu_improvements' into 3.6 2018-11-06 17:06:04 +01:00
Diego Prado Gesto
2c59419dbb Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-06 17:01:18 +01:00
Diego Prado Gesto
2d59ca02ca Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 16:59:07 +01:00
Ian Paschal
4c831de06c Remove console logs 
Contributes to CL-1126
 2018-11-06 16:41:59 +01:00
Ian Paschal
dc4b69c386 Show context menu at the right times 
Contributes to CL-1126
 2018-11-06 16:37:47 +01:00
Diego Prado Gesto
ce7d2c36d0 Fix the width of the slider label when the number of layers was exactly 
10, 100, 1000 and so on.

The calculation was using the maximumValue that is 9 in case we have 10
layers, since we start counting from 0 but showing from 1. Now it uses
maximumValue + 1.
 2018-11-06 16:15:32 +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
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