3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
17030 commits 306 branches 270 tags 786 MiB
Commit graph

17030 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
d61637e7cf Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 15:14:52 +02:00
Jaime van Kessel
ea324eadc0 Added scroll bar to per object panel 
If there are too many per object settings a scrollbar is now displayed

CURA-2131
 2016-08-22 15:14:10 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
Ghostkeeper
f296b77d2c
Fix check for presence of global_inherits_stack 
My mistake.

Contributes to issue CURA-2006.
 2016-08-22 14:17:47 +02:00
Jaime van Kessel
0c931424f9 Re-create the network manager every 30 seconds of not being connected 
CURA-1851
 2016-08-22 14:08:01 +02:00
Ghostkeeper
aefb36d1ec
Update activeValidationState if setting validation changed 
This was removed from onGlobalSettingChanged but never re-added anywhere.

I've updated it to check for both the global and the active stack, since some settings modify only the global stack (such as layer height).

Contributes to issue CURA-2006.
 2016-08-22 13:42:14 +02:00
Ghostkeeper
42399e82fb
) 
Contributes to issue CURA-2006.
 2016-08-22 11:36:33 +02:00
Ghostkeeper
1c1bfbe114
Fix providing of global_inherits_stack settings 
I've rewritten this part and documented what each case catches. There is a base case which is not required any more since we removed the global tab, but I left it in for defense.

Contributes to issue CURA-2006.
 2016-08-22 11:34:17 +02:00
fieldOfView
1003066ce1 Show qualities for the material associated with the currently selected quality 
CURA-2095
 2016-08-22 11:31:31 +02:00
fieldOfView
52dda935fc Switch to a generic quality profile if a material has no specific qualities 
CURA-2095
 2016-08-22 11:14:53 +02:00
Jaime van Kessel
7138fd6ef4 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 10:33:18 +02:00
Jaime van Kessel
bfc01827c2 We now always create a new socket on terminate 
CURA-2127
 2016-08-22 10:32:49 +02:00
Jaime van Kessel
5825793f28 QNetworkManager is now re-created every time we try to connect 
CURA-1851
 2016-08-22 09:49:57 +02:00
fieldOfView
7efde6b164 Prevent qml warning when no printer is connected 2016-08-20 23:42:51 +02:00
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
0a08707922 Added logging about network accessible state 
CURA-1851
 2016-08-19 15:30:34 +02:00
Jaime van Kessel
42bbf2b4c8 ALso abort if the network is not accesible 
CURA-1851
 2016-08-19 15:26:37 +02:00
Jaime van Kessel
1d6732273c Added local network connectivity detection 
CURA-1851
 2016-08-19 13:32:17 +02:00
Jaime van Kessel
5c2ac558ea Increased timeout time to 10 seconds 
CURA-1851
 2016-08-19 13:14:10 +02:00
Jaime van Kessel
edabe9d593 Improved logging a bit more 
CURA-1851
 2016-08-19 13:13:22 +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
Jaime van Kessel
99892ffd58 Added exception handling for disconnect issues on mac 
CURA-1851
 2016-08-18 13:28:04 +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