3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 20:31:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
16563 commits 342 branches 300 tags 756 MiB
Commit graph

7060 commits

Author SHA1 Message Date
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
Ghostkeeper
bd5df72116
Merge branch '3.6' 2018-11-06 16:10:02 +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
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
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
8106df1ae2 Bit of QML cleanup 2018-11-05 16:45:12 +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
Jaime van Kessel
2bb7b352ef Hide settings when pre-sliced g-code is loaded 
CURA-5772
 2018-11-05 13:25:47 +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
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
Diego Prado Gesto
53872f9a5b Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-02 13:36:47 +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
Diego Prado Gesto
a85fa6b9ad Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-01 09:24:05 +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
Jaime van Kessel
6256e3f24b Merge branch 'feature_add_printer_layout' of https://github.com/fieldOfView/Cura 2018-10-31 14:23:42 +01:00
Jaime van Kessel
6083eda3fa Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into CURA-5829-Add-preview-stage 2018-10-31 13:45:03 +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
e963fd2d85
Merge pull request #4445 from fieldOfView/fix_setting_float_precision 
Reduce the maximum precision of floats in SettingTextField inputs
 2018-10-31 12:26:34 +01:00
Lipu Fei
c27713c88a Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:58:16 +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
Lipu Fei
50d92df8a8 Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:01:16 +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
Jaime van Kessel
f773030218 Add main stage to previewStage so that SimulationView can use it 
CURA-5829
 2018-10-31 09:37:21 +01:00
Diego Prado Gesto
e2254fe039 Merge branch '3.6' into rename_ToolBox_to_Marketplace 2018-10-31 09:20:38 +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
Lipu Fei
09e7603dd6 Update nozzle_id to CC Red 0.6 
CURA-5839
 2018-10-30 12:28:58 +01:00
Lipu Fei
f0fa03c3ce Add CC 0.6 for UM S5 
CURA-5839
 2018-10-30 10:58:40 +01:00
Ghostkeeper
c736bfffb5
Add hotkeys for managing profiles and materials 
These are unused on all platforms. We can't use Ctrl+M (multiply selection), Ctrl+P (print) or Ctrl+Q (quit) sadly.

Fixes #4250.
 2018-10-30 10:54:14 +01:00
Diego Prado Gesto
b6ea0e6385 Make the height of the stage buttons themable. Now the height has to be 
28px as indicated by the UXers.

Contributes to CURA-5784.
 2018-10-30 10:38:53 +01:00
Mark
fda0f59c70 Rename user visible entries of ToolBox to Marketplace 
CURA-5874
 2018-10-30 10:27:22 +01:00
Diego Prado Gesto
aa75b64b5b Use the lining color to the default ouline color for the account widget. 
Contributes to CURA-5784.
 2018-10-30 09:48:56 +01:00
Lipu Fei
8bec733823
Merge pull request #4649 from Ultimaker/M&P-Setting-Optimization 
TPU temperatures update
 2018-10-30 08:32:56 +01:00
Ghostkeeper
f0d7c6fb52
Update version number to 3.6 
And fill in the report-msgid-bugs-to field where it was missing. There always seems to be something wrong with that metadata.

Contributes to issue CURA-5870.
 2018-10-29 15:13:25 +01:00
Ghostkeeper
9c65cc49e4
Update translation templates for all languages for 3.6 
This adds the new translations to 3.6 to the pre-filled translations from previous translation passes.

Contributes to issue CURA-5870.
 2018-10-29 15:08:03 +01:00
Ghostkeeper
cc8f7f1e0a
Update translation templates for Cura 3.6 
These are the new and changed strings for version 3.6.

Contributes to issue CURA-5870.
 2018-10-29 15:05:08 +01:00
Jaime van Kessel
fc6ad4f623 Put back the view menu, since it did more than just show the views 
CURA-5829
 2018-10-29 13:41:46 +01:00
Jaime van Kessel
ebe533bdc8 Move active view panel to previewStage 
CURA-5829
 2018-10-29 13:39:00 +01:00