GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 04:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 290 Branches 263 Tags
Commit Graph

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
2ff4e70c17 Merge changes from fdm_materials repo 2016-08-18 15:35:53 +02:00
fieldOfView
37e9382ce8 Remove unused "machine_preferences" section 2016-08-18 13:27:45 +02:00
fieldOfView
d36780ba54 Removed superfluous M140 command 2016-08-18 13:20:55 +02:00
fieldOfView
6e422e611c Change Simple Mode "print brim" to print a brim or raft 
CURA-2135
 2016-08-18 13:11:14 +02:00
fieldOfView
55942af9f7 Remove non-existing blackmagic/dual setting from defaults 2016-08-18 13:09:15 +02:00
fieldOfView
ad001c71be Simplify use of ExtrudersModel 2016-08-18 12:30:13 +02:00
fieldOfView
efbb2ed081 Code style 2016-08-18 11:54:24 +02:00
fieldOfView
4d7474b412 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-18 11:53:25 +02:00
fieldOfView
9b0e5f5a8d Simplify checking if a plugin exists 2016-08-18 11:53:10 +02:00
Ghostkeeper
75d0378a17 Merge pull request #930 from innovo3d/master 
Update def.json and STL file
 2016-08-18 09:56:59 +02:00
fieldOfView
0061e1329c Code-style 2016-08-18 09:28:38 +02:00
Aldo Hoeben
0e7893f71b Merge pull request #926 from thopiekar/master-CURA-2079 
[CURA-2079] Adding detailed error messages to firmware updater dialog
 2016-08-18 09:27:22 +02:00
fieldOfView
64510a6825 Listen to extruder-stack changes for extruder_prime_pos* 
CURA-1944
 2016-08-18 08:54:13 +02:00
fieldOfView
198a201612 Change _active_container_stack to _global_container_stack 
... to prevent confusion. In MachineManager.py the _active_container_stack variable name is used for the global-or-active-extruder stack. CURA-1944
 2016-08-18 08:43:53 +02:00
innovo3d
a8109f6267 Update def.json and STL file 
Updated JSON file:
- changed machine center is zero to true
- added turn heated bed off to end g code
- changed top/bottom thickness from 0.3 to 1.2mm
- added machine preferences as I did in 2.1 (is this still used?)

Updated STL file.  The last file was 13mb! this one is 810kb!
 2016-08-17 16:38:22 -05:00
Thomas Karl Pietrowski
c174ce4396 CURA-2079: Rework on adding detailed error messages to firmware updater 2016-08-17 22:34:04 +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
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
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
b2143e7d43 Remove code duplication 
CURA-2116
 2016-08-16 15:25:44 +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
Thomas Karl Pietrowski
8179fabf1d Merge remote-tracking branch 'upstream/master' into master-CURA-2079 2016-08-14 17:43:26 +02:00
Thomas Karl Pietrowski
f915092f83 CURA-2079: Finish firmware upload process on errors 
Looking at the old code shows that the download process was never
completely finished. The according function was only return'ed, but no
signal was emitted to the window to give the user the possibility to
close it again.

Optionally, it would be useful here to pass messages to the window
dialog to inform the user about problems.

However, this code is untested because:
1. I don't know where put my printers *.hex-file, when coding here with
my editor,
2. Have no idea how to reproduce the IO errors reported at JIRA, so
fingers crossed here.

Contributes to CURA-2079
 2016-08-14 17:37:36 +02:00