GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 16:19:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,916 Commits 295 Branches 268 Tags
Commit Graph

23916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
1dbd789d10 Only log messages without status when we are not in error mode. 
This prevents spamming the logs with messages
 2016-08-17 13:09:04 +02:00
Jaime van Kessel
f60871e068 Both timeout cases now abort the upload 
CURA-1851
 2016-08-17 13:07:20 +02:00
Jaime van Kessel
26eaedaa2c Improved verbosity of logging 2016-08-17 13:00:07 +02:00
Jaime van Kessel
d405afb9f2 Added bit more logging 2016-08-17 12:40:35 +02:00
Jaime van Kessel
8cc9e8cf72 Post requests are now aborted when connection is timed out 
CURA-1851
 2016-08-17 12:38:51 +02:00
Jaime van Kessel
e0ef1c3e9d Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-17 12:33:30 +02:00
Jaime van Kessel
f1f9f93fa4 Re-enabled prime position 
CURA-2130
 2016-08-17 12:33:00 +02:00
fieldOfView
58115ce798 Fixed one more occurrence of "hotend" to "PrintCore" 
CURA-2116
 2016-08-17 11:07:39 +02:00
fieldOfView
7528b2d970 code style 2016-08-17 10:04:09 +02:00
Jaime van Kessel
6b4e0740a3 Merge pull request #924 from Ultimaker/feature_machinesettings 
Machine Settings plugin
 2016-08-17 09:34:11 +02:00
Thomas Karl Pietrowski
e72a10c97a CURA-2079: Using errorCode (WIP) 
Sadly I don't see any reason why errorCode doesn't get updated in QML.
self._errorCode is accessible, but changes to it don't take any effect.
 2016-08-17 01:09:07 +02:00
Thomas Karl Pietrowski
b42ef49a4e Typo 2016-08-16 23:27:54 +02:00
fieldOfView
8b0587e75a Add logging with reason why printers don't have MachineSettings action 2016-08-16 21:10:58 +02:00
fieldOfView
42549df1f1 Fix setting the printhead polygon 2016-08-16 21:02:30 +02:00
fieldOfView
50cef30346 Don't increase BuildVolume above machine_height for one_at_a_time 2016-08-16 18:46:32 +02:00
fieldOfView
9b048efe22 Fixed copyrights 2016-08-16 18:19:25 +02:00
fieldOfView
631d079e26 Show only one "Successfully paired" message at once. 2016-08-16 17:57:07 +02:00
fieldOfView
063faf1520 Move the "Changes on Printer" dialog to JediWifiPrinting 
...to have full control over the terminology
CURA-2116
 2016-08-16 16:48:35 +02:00
fieldOfView
4f04acf8c5 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-08-16 16:46:52 +02:00
fieldOfView
dd649580f5 Move the "Changes on Printer" dialog to JediWifiPrinting 
...to have full control over the terminology
CURA-2116
 2016-08-16 16:46:35 +02:00
Jack Ha
07f2b2be95 More quality_types for more material/qualities. CURA-2006 2016-08-16 15:41:52 +02:00
fieldOfView
b2143e7d43 Remove code duplication 
CURA-2116
 2016-08-16 15:25:44 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
Jack Ha
80214d07bc Prettier number display in Profiles page. CURA-2006 2016-08-16 15:03:01 +02:00
Jack Ha
83b89d09d8 Fix for could not find quality xxx 2016-08-16 13:34:47 +02:00
Jack Ha
a27f2e8794 Added quality_type properties to printers. 2016-08-16 13:19:03 +02:00
Jack Ha
759ef29b1d Fix keep user settings dialog. 2016-08-16 13:12:34 +02:00
Thomas Karl Pietrowski
0435706736 CURA-2079: Adding error messages to the firmware update dialog 
Adds messages for IO errors, communication errors, missing firmware and
a general message for unknown problems.
 2016-08-16 12:25:55 +02:00
Thomas Karl Pietrowski
9a34f6b067 CURA-2079: First concept 2016-08-16 11:36:13 +02:00
fieldOfView
105541ed07 Hide "0%" progress while in pre_print state 
CURA-1963
 2016-08-16 11:19:50 +02:00
fieldOfView
12d59cb465 Only show "Enable Prime Tower" setting for multiextrusion printers 
CURA-2126
 2016-08-16 10:58:37 +02:00
fieldOfView
8c63216fdf Get how we name variants from the machine definition 
CURA-2116
 2016-08-16 10:18:57 +02:00
fieldOfView
6bcea1e309 Add prime tower to disallowed areas 
CURA-1944
 2016-08-16 09:25:00 +02:00
fieldOfView
c60ddbecfb Make sure a machine is always selected on the Printers page 
CURA-2085
 2016-08-15 18:07:00 +02:00
fieldOfView
fcfcfa37fb Tweak monitor items for long jobnames 
CURA-2125
 2016-08-15 17:09:29 +02:00
fieldOfView
6220976f03 Add a custom machine definition 
CURA-580
 2016-08-15 16:15:31 +02:00
fieldOfView
7d37cbd5d2 Merge branch 'master' into feature_machinesettings 2016-08-15 16:07:53 +02:00
fieldOfView
9e7e469df8 Move plugin files into main repo location 2016-08-15 16:06:34 +02:00
fieldOfView
f2a44bec8d Add missing material_bed_temp_prepend 2016-08-15 15:55:45 +02:00
fieldOfView
f5d6c6024e Update buildvolume when extruder prime location is changed 
CURA-1944
 2016-08-15 15:48:25 +02:00
fieldOfView
48cfea01d0 Set sensible defaults for which "Dual Extrusion" settings are visible 
CURA-916
 2016-08-15 15:34:54 +02:00
fieldOfView
b7b0faf44a Fix sorting of settings on Profile manager page 
CURA-2123
 2016-08-15 15:17:59 +02:00
fieldOfView
dbaa6190be Add firmware upload for umo_dual 
CURA-1774
 2016-08-15 13:43:16 +02:00
fieldOfView
f0622cdda6 Add start & end gcode to UM2 depending on gcode flavor 
CURA-580
 2016-08-15 13:42:06 +02:00
Aldo Hoeben
db4a198a1c Merge pull request #922 from thopiekar/master-CURA-2079 
CURA-2079: Finish firmware upload process on errors
 2016-08-15 12:22:00 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology 
Update UI texts to be compliant to Ultimaker dictionary
 2016-08-15 11:35:19 +02:00
fieldOfView
633e37713c Update Printer manager details pane after removing a printer 
CURA-2085
 2016-08-15 11:32:09 +02:00
Jack Ha
c362c2e0b9 Correct spelling 2016-08-15 11:04:26 +02:00
Jack Ha
5a92269a08 Testing. CURA-2007 2016-08-15 09:32:51 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00