3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28446 commits 340 branches 299 tags 734 MiB
Commit graph

6967 commits

Author SHA1 Message Date
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
Ghostkeeper
92c407580a
Comment out visibility of flow temperature graph 
Apparently it's not allowed to be in there. By being commented out I hope that a future developer won't make the same mistake and add it there to be editable in the interface.
 2017-09-28 15:33:00 +02:00
alekseisasin
2a302a3e27 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-28 13:24:13 +02:00
alekseisasin
5402092bb4 During adding a new printer the printer name generated from default name and not from custom name (changed by user) 
CURA-4345
 2017-09-28 13:22:15 +02:00
Diego Prado Gesto
e3edc79a3e modified some code to fix the multiple extrusion issues - CURA-4379 2017-09-28 13:21:03 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ChrisTerBeke
f5310ad2ff Revert "For discard changed window retrieve data from setting "value" property instead of "resolve"" 
This reverts commit a2e0f4d64f.
 2017-09-27 14:16:56 +02:00
Jaime van Kessel
035a851eb0 Merge pull request #2480 from fieldOfView/fix_disable_solid_view 
Make Solid View a required plugin
 2017-09-27 13:03:51 +02:00
Jaime van Kessel
e87f30cf09 Merge branch '3.0' of github.com:Ultimaker/Cura 2017-09-27 13:02:21 +02:00
Jaime van Kessel
2dee054003 Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0 2017-09-27 12:57:42 +02:00
alekseisasin
a2e0f4d64f For discard changed window retrieve data from setting "value" property instead of "resolve" 
CURA-4358
 2017-09-27 11:27:29 +02:00
Diego Prado Gesto
568535e3e2 Adapting the code in case a multiextruder printer will use only one extruder - CURA-4359 2017-09-26 17:49:53 +02:00
fieldOfView
565ed4933b Use pixels instead of points for text in splash-screen 
The current splashscreen implementation uses DPI-independent pixel sizes for everything, but point sizes take the DPI into account. This caused too large text and misalignment in the splash screen on Hi DPI screens on Windows.
 2017-09-26 11:56:14 +02:00
Diego Prado Gesto
b82309fb6a Merge branch 'custom_profiles' into 3.0 2017-09-25 15:52:31 +02:00
Diego Prado Gesto
2ae1700a15 Solved the issue with the slider that was no showing in gray the unavailable profiles - CURA-4327 2017-09-25 14:43:29 +02:00
fieldOfView
7c1de0c0d2 Make Solid View a required plugin. 
There is no plugin with the id "MeshView"
 2017-09-25 11:28:08 +02:00
Diego Prado Gesto
c22928f5d1 Change behavior when there is no suitable item - CURA-4327 2017-09-25 08:43:57 +02:00
Diego Prado Gesto
cf94c8d37d Working on fixing several issues with profiles - CURA-4327 2017-09-22 14:47:20 +02:00
Ghostkeeper
c02c2201e2
Merge branch '3.0' 2017-09-22 12:58:40 +02:00
Ghostkeeper
2020e355a2
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 
Contributes to issue CURA-4357.
 2017-09-22 12:58:20 +02:00
Ghostkeeper
261089eed3
Fix type hinting imports 
Because circular imports. I hate our current import technique...

Contributes to issue CURA-4357.
 2017-09-22 11:53:10 +02:00
Ghostkeeper
3d921c1b4e
Add type hinting of return values 
I thought this might help find some bugs there.

Contributes to issue CURA-4357.
 2017-09-22 11:30:35 +02:00
Diego Prado Gesto
4d113a746c Merge changes 2017-09-22 11:29:29 +02:00
Diego Prado Gesto
37da9f654b Reverted changes done that makes sliders fail - CURA-4327 2017-09-22 11:20:57 +02:00
Ghostkeeper
1596437bbd
getActiveGlobalAndContainerStacks may return None 
Change the code to reflect on this. Mostly this is to fix up the type warnings, because we were already checking for there being no global container stack but that was not thread-safe.

Contributes to issue CURA-4357.
 2017-09-22 11:17:42 +02:00
Ghostkeeper
88155d35e8
Correct signature of activeMachine 
Because there isn't always a global container stack.

Contributes to issue CURA-4357.
 2017-09-22 11:11:34 +02:00
Ghostkeeper
12ccc8abe0
Merge branch '3.0' 2017-09-22 09:55:05 +02:00
ChrisTerBeke
ab8bcc4ae3 small code fixes 2017-09-22 09:51:59 +02:00
Ghostkeeper
1bb11b521e
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-22 09:32:03 +02:00
Mark
d2de039371 dont disappear when click on splashscreen 
CURA-4343
 2017-09-22 09:11:35 +02:00
ChrisTerBeke
fd41f3d17f Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-21 17:35:19 +02:00
ChrisTerBeke
ecafa24888 code cleanup 2017-09-21 17:35:12 +02:00
Diego Prado Gesto
e73e218c4e Detecting whether the profile is created for multiple extrusion printers or not - CURA-4327 2017-09-21 16:28:50 +02:00
Mark
f7d14c5b7f dont disappear when click on splashscreen 
CURA-4343
 2017-09-21 16:08:46 +02:00
ChrisTerBeke
a74a6a59fc CURA-4182 fix merge conflicts with 3.0 branch 2017-09-21 15:33:00 +02:00
Ghostkeeper
382fcdb4fe
Better title for export succeeded message 2017-09-21 12:54:04 +02:00
Diego Prado Gesto
4d99fb067f After disconnect a signal, now is reconnected the correct one - CURA-4327 2017-09-20 17:19:44 +02:00
Jaime van Kessel
3cdf3f6097 Merge branch '3.0' of github.com:Ultimaker/Cura 2017-09-20 10:43:06 +02:00
Diego Prado Gesto
ebd180bfdc Custom profiles are now shown in the preference panel - CURA-4327 2017-09-20 08:50:58 +02:00
Jaime van Kessel
5d4b23e72a Merge branch 'feature_home_camera' of https://github.com/fieldOfView/Cura 2017-09-19 16:47:40 +02:00
Jaime van Kessel
4e897a9a00 Re-enabled the progress circle 
A fix in Uranium made it possible for a timer to function, which ensures that it no longer breaks on linux

CURA-4343
 2017-09-19 11:31:28 +02:00
Jaime van Kessel
d49e84830b Removed spinner as it caused the crash 
We might want to consider getting the spinner back, but for the moment it's best left out

CURA-4343
 2017-09-19 09:51:07 +02:00
Jaime van Kessel
d5c9ebd58a Setting message now also forces repaint 
CURA-4343
 2017-09-19 09:45:28 +02:00
Jaime van Kessel
276f05bedb Added flush to splash screen 
This greatly reduces the issues with it CURA-4343
 2017-09-19 09:45:28 +02:00
Jaime van Kessel
847cd1b293 Removed spinner as it caused the crash 
We might want to consider getting the spinner back, but for the moment it's best left out

CURA-4343
 2017-09-19 09:43:35 +02:00
Jaime van Kessel
e0480528a0 Setting message now also forces repaint 
CURA-4343
 2017-09-19 09:38:08 +02:00
Jaime van Kessel
e1ea8df84c Added flush to splash screen 
This greatly reduces the issues with it CURA-4343
 2017-09-19 09:32:13 +02:00
ChrisTerBeke
3db04c918f fixes for reverting 11ebdf7303 2017-09-18 15:37:17 +02:00
Ghostkeeper
050474ef9e
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-18 11:17:54 +02:00
ChrisTerBeke
f07f7a2f12 Remove logging 2017-09-18 10:51:32 +02:00