GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 23:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,569 Commits 291 Branches 265 Tags
Commit Graph

3619 Commits

Author SHA1 Message Date
Ghostkeeper
b0f7a5b358
Fix translation of there being no file formats available 
This entry said that it had a context, but it had none. As a result, the whole string was seen as a context.
 2018-03-15 16:53:26 +01:00
Lipu Fei
440a56b7fa Fix settings export in gcode 2018-03-15 16:42:11 +01:00
Ian Paschal
f2512a92a7
Merge pull request #3154 from fieldOfView/fix_per_meshgroup_settings 
Enable setting per mesh group settings when printing One at a Time
 2018-03-15 16:38:50 +01:00
alekseisasin
67261ccd4b
Merge pull request #3144 from fieldOfView/feature_preheat_extruder 
Feature preheat extruder
 2018-03-15 16:38:18 +01:00
Lipu Fei
98b325c9d5 Fix material serialization crash 2018-03-15 14:54:37 +01:00
Aleksei S
097c97b6f8 Fix: Refresh list of available printers in network 
after clicking refresh button.
 2018-03-15 14:33:27 +01:00
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder 
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
 2018-03-15 11:21:37 +01:00
fieldOfView
dee70f35f4 Fix setting visibility when searching 2018-03-15 11:03:27 +01:00
fieldOfView
8fe2077413 Merge branch 'master' into fix_per_meshgroup_settings 2018-03-15 10:40:18 +01:00
Jack Ha
98b0559c9a Merge branch 'master' into speedup 2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d CURA-5090 speedups by using qtimers on updating mostly visual elements 2018-03-14 16:09:59 +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
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
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
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +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
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
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
Jack Ha
1d4b2eac4b CURA-5048 solved merge conflict 2018-03-14 09:03:17 +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
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
493bfb6b17 Fix material serialization 
CURA-5086
 2018-03-13 16:37:04 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Lipu Fei
934d297e6c Split error checking into smaller sub-tasks 
CURA-5059

Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
 2018-03-13 13:21:44 +01:00
Diego Prado Gesto
dfb903fb81 CURA-4870 Wait until the configuration has all the mandatory data before 
add it to the list of unique configurations.
Remove some connections to signals and reuse already defined listeners.
 2018-03-13 13:14:29 +01:00
Ian Paschal
8db4396ee7
Merge pull request #3436 from Ultimaker/feature_enable_disable_extruder 
CURA-4400 Feature enable disable extruder
 2018-03-12 16:42:25 +01:00
Jaime van Kessel
522e297711 Add some more states to check if print_job is active 2018-03-12 16:33:32 +01:00
Lipu Fei
c54679ba2d Gix buildplate handling in Material profile 
CURA-4606
 2018-03-12 15:25:29 +01:00
Jack Ha
e0e2d3362b CURA-4400 fix for change in fdmprinter: move -1 from default_value to value 2018-03-12 13:30:31 +01:00
Jack Ha
aa3cd8ba9d Solved merge conflict 2018-03-12 11:39:39 +01:00
Jack Ha
3edc96ec8f CURA-4400 fixed wrongly converted expression 2018-03-12 10:47:23 +01:00
Diego Prado Gesto
9613103591 CURA-4870 Remove Monitor stage status icons 2018-03-12 10:45:49 +01:00
Lipu Fei
2c5cc17b49 Fix build plate compatibility check 
CURA-5078
 2018-03-12 10:34:18 +01:00
Ghostkeeper
d98cab48ac
Get scripts from either Resources or Preferences 
We must retain the old directory for legacy. People might still have scripts there.
 2018-03-12 09:48:03 +01:00
Ghostkeeper
a3efbc70fb
Merge branch 'fix_postprocessing_script_path' of https://github.com/fieldOfView/Cura into fieldOfView-fix_postprocessing_script_path 2018-03-12 09:42:21 +01:00
Ghostkeeper
15212d4426
Align for readability 2018-03-12 09:38:20 +01:00
Ghostkeeper
aae8a31f00
Don't display extruder count if you can't use it 
If your printer can only handle one extruder, don't display this drop-down. Don't let users get confused.
 2018-03-12 09:23:25 +01:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Lipu Fei
7312ed8e3c Fix project loading for version upgrade 
CURA-5054
 2018-03-09 19:35:23 +01:00
Lipu Fei
e09325bf82 Fix project loading for version upgrade 
CURA-5054
 2018-03-09 17:16:27 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
Lipu Fei
a81981a27a Better info on no profiles to import for gcode 
CIRA-4946

If a gcode is sliced with default profiles, there won't be any custom
profiles to import from that gcode. In that case, we show a info message
telling the user about this instead of showing an error message.
 2018-03-09 16:40:57 +01:00
Ghostkeeper
cf21e7c74b
Also upgrade definition_changes and user 
Because these files share their version numbers with quality changes.

Contributes to issue CURA-5054.
 2018-03-09 16:21:42 +01:00