GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 02:17:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,496 Commits 290 Branches 260 Tags
Commit Graph

13496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
e6c5bd28b2 CURA-4870 Use the visible property instead of a Qt5.10 existing 'opened' 
property.
This is needed to avoid a crashing for those that are using 5.10 running from
source.
 2018-03-14 16:53:51 +01:00
Diego Prado Gesto
2fdd51fc23 CURA-4870 Bind the network information with the output devices changed 
signal.
 2018-03-14 16:47:01 +01:00
Diego Prado Gesto
a0736d61df Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 15:17:21 +01:00
Diego Prado Gesto
61ce0c3154 CURA-4870 Make the configuration pop-up open and close with one click. 
Before it was the case in which sometimes the user needs two clicks for
that.
Also collapse the dropdown when the configuration is applied.
 2018-03-14 15:15:43 +01:00
Jaime van Kessel
0d23ea2194 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 14:45:20 +01:00
Jaime van Kessel
ad3c5466d1 Added bunch of typing to clusteroutput device 2018-03-14 14:45:01 +01:00
Lipu Fei
241611546e Fix quality details view 
CURA-5054
 2018-03-14 14:41:44 +01:00
Jaime van Kessel
962c5f3260 Added bit of defensive coding to cluster output device 2018-03-14 14:39:06 +01:00
Lipu Fei
22573a685d Fix quality definition comparison in quality importing 
CURA-4946
 2018-03-14 14:31:30 +01:00
Ghostkeeper
877d061a1b
Catch FileNotFoundError when updating custom firmware 
In case there is a bug there, we won't crash the thread.
 2018-03-14 14:24:08 +01:00
Lipu Fei
0655ef0bc5 Fix quality profile import 
CURA-4946
 2018-03-14 14:22:46 +01:00
Jaime van Kessel
fa9dc7a1df Fixed send custom firmware 2018-03-14 14:20:03 +01:00
Diego Prado Gesto
ff676c98a6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 13:56:24 +01:00
Diego Prado Gesto
1111fbaa78 CURA-4870 Changing the version upgrade to include new metadata entries 
for the container stacks.
 2018-03-14 13:53:04 +01:00
Lipu Fei
191faaba19 Fix machine definition in quality importing 
CURA-4946
 2018-03-14 13:49:16 +01:00
ChrisTerBeke
eec963b313 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-03-14 13:30:30 +01:00
ChrisTerBeke
474db38ddf Fix failing test for um3_extended 0.8 variant 2018-03-14 13:30:20 +01:00
Ian Paschal
05c59ddaa7 CURA-4946 Handle gcode with wrong quality definition 
Some gcode has its quality definition set to, say, UM2 extended, which is _actually_ just UM2 gcode. Thus, we check if the definition in the profile matches the current machine or what it in theory should be, either one being valid. See comments in code for details.
 2018-03-14 13:29:48 +01:00
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
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
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
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