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

16579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jaime van Kessel
44954c4cad Fixes required for semantic versioning 
CURA-5840
 2018-11-01 14:15:16 +01:00
Lipu Fei
ff4dfcf9a6 Make Cura app display name configurable 
CURA-5842
 2018-11-01 12:15:00 +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
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
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
50d92df8a8 Merge remote-tracking branch 'origin/3.6' 2018-10-31 11:01:16 +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
Ghostkeeper
779496f846
Don't require MirrorTool, RotateTool, ScaleTool or SimulationView 
This was changed last April without consulting the rest of the team. We're reverting it because there is really no reason why these should not be disabled.
 2018-10-31 10:37:25 +01:00
Ghostkeeper
8a52fd2c2c
Document why these plug-ins are required 
For the SimulationView, MirrorTool, RotateTool, ScaleTool and TranslateTool I couldn't really find a reason why this is required, so I can't document it.
 2018-10-31 10:34:26 +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
37179e7785
Merge branch '3.6' 2018-10-30 11:11:03 +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
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
Ian Paschal
adac66b3f7 Always show camera icon in monitor tab 
Contributes to CL-1063
 2018-10-30 10:53:43 +01:00
Ghostkeeper
cc8776a9b0
Merge branch '3.6' 2018-10-30 10:39:44 +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