3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
5624 commits 307 branches 270 tags 779 MiB
Commit graph

5624 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
2f3f57c43d Code-style 2016-08-20 23:40:43 +02:00
fieldOfView
a1c3b8f3a8 Update start- & and gcode and change extruder names 
CURA-1774
 2016-08-20 17:20:51 +02:00
fieldOfView
9f34e06cb6 Add prime tower and extruder switch position 
CURA-1774
 2016-08-20 14:31:18 +02:00
fieldOfView
d8d328c491 Code style 2016-08-19 17:22:55 +02:00
Ghostkeeper
eaa7d716f5 Revert "Properly send global settings to the global stack" 
This reverts commit 9d0acf5b03.
It was not so proper after all.

Contributes to issue CURA-2006.
 2016-08-19 15:48:35 +02:00
Jaime van Kessel
a01a541c5d When two nodes overlap, only one is pushed free 
Fixes CURA-2137
 2016-08-19 11:21:49 +02:00
Jaime van Kessel
e3d4a33954 Fixed legacy profile reader 
Updated some settings that were changed from 2.1 to 2.2. Also fixed some
architecture changes that were not changed correctly (or at all)

CURA-1493 and CURA-1779
 2016-08-19 10:38:18 +02:00
Jaime van Kessel
286949dad1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-19 09:36:56 +02:00
fieldOfView
069df0ae31 Add an initial set of Ultimaker materials 
These materials are auto-generated by a script, based on the generic profiles, and may contain incorrect data.
 2016-08-18 18:59:18 +02:00
fieldOfView
7affff53ba Merge commit 'ec04b414ec' 2016-08-18 17:48:48 +02:00
fieldOfView
ec04b414ec Remove 0.6mm and 0.8mm hotends for UMO because we don't support them in Cura 2016-08-18 17:47:53 +02:00
fieldOfView
f9d00f57ce Revert "Removed superfluous M140 command" 
This reverts commit d36780ba54.
One was M104, the other was M140. I am not dyslecitc, my mother had me tested.
 2016-08-18 17:39:22 +02:00
fieldOfView
00835e4300 Merge commit '7911254edc' 2016-08-18 17:29:37 +02:00
fieldOfView
7911254edc Update machine identifiers 2016-08-18 17:28:03 +02:00
Ghostkeeper
0c0871656b
Cache container registry before for loop 
Slight performance increase. We should pay more attention to this kind of thing.

Contributes to issue CURA-2006.
 2016-08-18 17:26:51 +02:00
fieldOfView
86ead22143 Make machine identifiers consistent 
CURA-2136
 2016-08-18 17:18:03 +02:00
fieldOfView
49c885923a Update machine_identifiers 2016-08-18 17:10:45 +02:00
fieldOfView
47fde625ba Merge commit '8d00e28fb0' 
# Conflicts:
#	resources/materials/generic_abs.xml.fdm_material
#	resources/materials/generic_cpe.xml.fdm_material
#	resources/materials/generic_pla.xml.fdm_material
 2016-08-18 16:42:59 +02:00
fieldOfView
8d00e28fb0 Update versions, per the specification 2016-08-18 16:40:36 +02:00
fieldOfView
2ff4e70c17 Merge changes from fdm_materials repo 2016-08-18 15:35:53 +02:00
fieldOfView
74fec5c3ec Merge data with Cura repo 2016-08-18 13:50:46 +02:00
fieldOfView
727f53b3d1 Update densities with data from materials team 2016-08-18 13:36:39 +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
Marco Teunissen van Manen
eb8cedb1c6 Update generic_pla.xml.fdm_material 
Added properties (density, diameter)
 2016-08-18 13:08:21 +02:00
Marco Teunissen van Manen
d9d6d1849a Update generic_cpe.xml.fdm_material 
Added properties (density, diameter)
 2016-08-18 13:07:52 +02:00
Marco Teunissen van Manen
387c7369b4 Update generic_abs.xml.fdm_material 
Adding properties (density/diameter)
 2016-08-18 13:07:17 +02:00
Jaime van Kessel
eae2e0da90 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-18 12:44:53 +02:00
Jaime van Kessel
7744ee5f13 Duplicating a material forces unique ID 
CURA-1969
 2016-08-18 12:44:16 +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
Jaime van Kessel
7075e438d9 Changing metadata now only targets profiles that share basefile 
CURA-1874
 2016-08-18 11:40:01 +02:00
Jaime van Kessel
37e4b9e940 Duplicating a container no longer forces unique GUID 
CURA-1969
 2016-08-18 10:55:51 +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