GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 20:19:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,447 Commits 290 Branches 260 Tags
Commit Graph

4447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
e495534219 Rapid succesion of tool operations no longer freeze interface on Ubuntu 
CURA-2158
 2016-08-23 11:50:28 +02:00
fieldOfView
4e6756802f Correct position of prime_tower disallowed area 
CURA-2155
 2016-08-23 11:36:34 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
fieldOfView
344be2687e Display the appropriate profile settings on Profiles page 
CURA-2006
 2016-08-22 22:38:13 +02:00
fieldOfView
cfb062718f Fix creating a clone of criteria 
CURA-2006
 2016-08-22 21:43:32 +02:00
fieldOfView
0f998c6e2e Fix qml warnings 
CURA-2006
 2016-08-22 19:25:42 +02:00
fieldOfView
08091209f1 Fix profile display for printers without machine-specific material profiles 
CURA-2006, CURA-1774
 2016-08-22 19:21:44 +02:00
fieldOfView
62e815a3d8 Fix qml warning 
CURA-2006
 2016-08-22 19:16:59 +02:00
fieldOfView
b9af9dce1f Tweak profile overview layout 
CURA-2006
 2016-08-22 19:00:49 +02:00
fieldOfView
1c87c17d77 Fix MachineSettingsAction after CURA-2006 2016-08-22 18:45:18 +02:00
fieldOfView
9981cfbf6a Simplify interface of UMOUpgradeSelection 2016-08-22 18:44:46 +02:00
fieldOfView
3671d241d5 Show color + material in menus and Materials page 
CURA-2108
 2016-08-22 17:34:33 +02:00
fieldOfView
cb6353ba2a Fix machine_has_heated_bed default 2016-08-22 17:16:08 +02:00
fieldOfView
5bf19f9ff2 Fix preferred material for cases when there more than 1 "pla" materials 2016-08-22 17:12:39 +02:00
fieldOfView
756422fc0e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-22 16:41:31 +02:00
fieldOfView
320cddb073 Don't show "nozzle" on Materials page when there are no variants 2016-08-22 16:41:21 +02:00
Jaime van Kessel
2ad907cdd1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 16:32:18 +02:00
Jaime van Kessel
fc5900c05a Width of the scrollview is now a bit wider, so minus signs don't fall off 
CURA-2131
 2016-08-22 16:30:56 +02:00
fieldOfView
c32700b7b4 Fix "Set as Active Extruder" menu item 2016-08-22 16:30:34 +02:00
fieldOfView
900f953298 Make sure extruder menus are only shown if there the machine extruders 2016-08-22 16:15:59 +02:00
Ghostkeeper
f91c101b85 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-22 15:17:31 +02:00
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
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
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 9d0acf5b036ee4749af0034969c683e39cc547d3.
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 'ec04b414ecdc78e31f8de120c197fb48dcc3cb77' 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 d36780ba54f0e208e6c7ff1b4b91c4ebdc0a7dc4.
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 '7911254edc48a55bb9ea46fa0b5237f3a1392731' 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