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

13930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
Lipu Fei
d6b270954a Fix the case when no quality is available 
CURA-5044

The tooltip should also show up if there is no quality available.
 2018-03-14 13:11:24 +01:00
Lipu Fei
fcd50b0cf2 Fix code style 
CURA-5044
 2018-03-14 13:10:58 +01:00
Lipu Fei
53626d3c67 Also force update validationState 
CURA-5048
 2018-03-14 13:02:52 +01:00
Lipu Fei
b8c32eb166 Fix typo in ConfigurationListView.qml 2018-03-14 12:59:48 +01:00
Diego Prado Gesto
23a2b6e0f7 CURA-4870 Don't show the configuration selector if the printer is not a 
network printer (for example don't show if is USB)
 2018-03-14 11:54:10 +01:00
Aleksei S
fc977088a8 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-14 11:46:56 +01:00
Aleksei S
160a59191b Show Tooltip for the unavailable slider's area 
CURA-5044
 2018-03-14 11:45:00 +01:00
Ghostkeeper
3636c4a51b
Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 11:44:41 +01:00
Ghostkeeper
daf77517ac
Merge branch 'master' of https://github.com/slundell/Cura into slundell-master 
Conflict in USBPrinterOutputDevice was caused by us adding a try-except block around a piece of code where Slundell removed one of the lines of code.
 2018-03-14 11:35:06 +01:00
Jaime van Kessel
561b97c255 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 11:32:52 +01:00
Jaime van Kessel
8dd2243399 Fixed stupid mistake that made all snapshots be taken from the back of model 2018-03-14 11:32:36 +01:00
Diego Prado Gesto
c69987b824 CURA-4870 Reintroduce the "Check compatibility" link in the sidebar 2018-03-14 11:26:22 +01:00
Jack Ha
f50e78d9bb Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 11:07:47 +01:00
Jack Ha
9f40e3925d CURA-5090 added timer to SettingInheritanceManager._update 2018-03-14 11:07:38 +01:00
Lipu Fei
f5f8bf19ec Fix QML warnings 2018-03-14 11:05:32 +01:00
Lipu Fei
4cc2d882d3 Fix merge conflicts 
CURA-4879
 2018-03-14 10:53:10 +01:00
Ian Paschal
8efc3b8b5d Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-14 10:51:02 +01:00
Ian Paschal
4a16d04dd7 CURA-5053 Changed printer type checking 
"Still hard coded but at least doesn't use `elif` because `elif`/`else if` should not exist in any programming language." - Grumpy Pedants & Ian >:[
 2018-03-14 10:50:54 +01:00
Lipu Fei
cff1e8639d Fix preferred material PLA for printrbot simple makers kit 
CURA-5089
 2018-03-14 10:48:05 +01:00
Lipu Fei
17525b9cb6
Merge pull request #3421 from timur-tabi/master 
Add definition for Printrbot Simple Maker's Kit 1405
 2018-03-14 10:47:20 +01:00
Lipu Fei
86afd6f5ff Do not overwrite existing metadata with in material deserializeMetadata() 
CURA-5056
 2018-03-14 10:32:57 +01:00
Lipu Fei
dc427488a2 Fix extruder position check in project loading 
CURA-5056

The field is now "position" instead of "extruder"
 2018-03-14 10:30:32 +01:00
Jack Ha
b983a50bcd Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 10:21:18 +01:00
Jack Ha
7ebd83f815 CURA-4400 get setting type from definition instead of whole stack improves speed of this call by a factor of 10 2018-03-14 10:21:10 +01:00
fieldOfView
7e4cb1c36e Disable Support Eraser if anti_overhang_mesh is disabled 2018-03-14 10:08:00 +01:00
Lipu Fei
3cefacdfcc Remove root_material_nod is None check in MaterialManager 
CURA-5056

This will no longer happen.
 2018-03-14 09:28:35 +01:00
Jack Ha
ac9bd954df Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 09:03:25 +01:00
Jack Ha
1d4b2eac4b CURA-5048 solved merge conflict 2018-03-14 09:03:17 +01:00
Ghostkeeper
00bd306307
Merge branch 'M&P-Setting-Optimization' 2018-03-14 09:02:38 +01:00
Ghostkeeper
9f89678e42
Update when switching printers 
I confused globalContainerChanged with activeStackChanged.

Contributes to issue CURA-4606.
 2018-03-14 08:26:12 +01:00
fieldOfView
a536da503b Rename DepthPass to PickingPass 
The map created by the shader is not strictly a depth map; not only is the "depth" encoded in the rgb channels, but it is also a distance to the camera instead of a "scene depth".
 2018-03-13 20:40:41 +01:00
fieldOfView
d88724aff5 Move ray picking to DepthPass 2018-03-13 20:05:49 +01:00
fieldOfView
73558c9e36 Fix rendering depth pass 2018-03-13 19:44:53 +01:00
Lipu Fei
b83fd17038 Fix GUI update upon material data change 
CURA-5084
 2018-03-13 17:43:01 +01:00
Lipu Fei
d2eb01d137 Fix material name update on sidebar 
CURA-5084
 2018-03-13 17:41:15 +01:00
Jack Ha
406e546195 CURA-5048 fixed nozzle dependent settings to update after setting machine nozzle diameter in a crude way 2018-03-13 17:29:20 +01:00
Jaime van Kessel
7b3598e992 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-13 16:54:09 +01:00
Jaime van Kessel
00f5e6ff7c Only trigger platform physics update if the node has meshdata 2018-03-13 16:53:28 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button 
[Feature] Sync Button
 2018-03-13 16:52:39 +01:00
Lipu Fei
5adb769cf8 Fix value function for extruders_enabled_count 
CIRA-5056
 2018-03-13 16:48:44 +01:00
Jaime van Kessel
283d08a0d6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-13 16:46:51 +01:00
Jaime van Kessel
40d300f5cc Change default direction of snapshot, so robot looks in the same direction as our beautifull logo; the ultibot 2018-03-13 16:46:02 +01:00
Aleksei S
37bb48d04f Merge branch 'master' of github.com:Ultimaker/cura 2018-03-13 16:38:29 +01:00
Aleksei S
e2cbfa8cec Fix: Retrieve printer type during creating outputDevice 
CURA-5053
 2018-03-13 16:37:09 +01:00
Lipu Fei
493bfb6b17 Fix material serialization 
CURA-5086
 2018-03-13 16:37:04 +01:00
Lipu Fei
e91b955f1e
Merge pull request #3485 from Ultimaker/CURA-5059_reset_icon_visibility 
Cura 5059 reset icon visibility
 2018-03-13 16:11:58 +01:00
Diego Prado Gesto
855df814d8 CURA-4870 Fix some style with brackets in QML 2018-03-13 16:11:51 +01:00
Lipu Fei
c8a882849f Simplify task queue for machine error check 
CURA-5059
 2018-03-13 16:08:46 +01:00
Jack Ha
9e0a78929a CURA-5059 changed error check timer interval and added measured time in logging 2018-03-13 16:02:57 +01:00