3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-27 21:01:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
10383 commits 344 branches 300 tags 757 MiB
Commit graph

2336 commits

Author SHA1 Message Date
ChrisTerBeke
ab8bcc4ae3 small code fixes 2017-09-22 09:51:59 +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
ChrisTerBeke
a74a6a59fc CURA-4182 fix merge conflicts with 3.0 branch 2017-09-21 15:33:00 +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
ChrisTerBeke
4ca5987ca8 CURA-4269 added a flag to determine wether auto drop should be executed or not 2017-09-18 10:50:52 +02:00
Ghostkeeper
2901b832a5
Sync setting visibility with XmlMaterialProfile 
This is why we shouldn't do double-data.
 2017-09-18 09:00:39 +02:00
fieldOfView
3f903d2c76 Add menu item to reset the camera 2017-09-16 10:05:45 +02:00
Diego Prado Gesto
f139bbe3f1 Fixed some missed references to the previous variables - CURA-4232 2017-09-15 16:05:24 +02:00
alekseisasin
aa0ade2e74 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483 Removed 14bitVoid code accord to a new LGPL license 
CURA-4232
 2017-09-14 18:03:31 +02:00
ChrisTerBeke
51e257eda6 remove unused Logger import 2017-09-14 16:15:14 +02:00
ChrisTerBeke
11ebdf7303 CURA-4269 disable auto-drop for first time loaded models from project files 2017-09-14 16:06:51 +02:00
Lipu Fei
b9b273b1aa Update splash window 
CURA-4215
 2017-09-14 14:52:03 +02:00
Lipu Fei
9683dcae72 Remose useless code 
CURA-4215
 2017-09-14 11:44:09 +02:00
Lipu Fei
7144720d78 Redesign splash window 
CURA-4215

- Rectangle splash window
- Fix for splash window crash
- Enable antialias
- Fix for longer loading text in some languages
 2017-09-14 11:36:27 +02:00
Lipu Fei
84ad9c6ad1 Add "available" flag for quality profiles 
CURA-4182

Add "available" flag for quality profile model so the slider can use it
to show available and unavailable profiles.
 2017-09-13 16:40:59 +02:00
alekseisasin
d0997f7f7e Merge branch 'master' of github.com:Ultimaker/cura 2017-09-13 13:58:39 +02:00
alekseisasin
204019702d Added Title for messages 
CURA-4203
 2017-09-13 13:58:08 +02:00
Diego Prado Gesto
fd1c76ac80 Merged branch - CURA-4270 2017-09-13 13:25:00 +02:00
alekseisasin
6a9c7539c4 Merge branch 'feature_new_splash_window' 
CURA-4215
 2017-09-12 16:06:22 +02:00
Lipu Fei
a28264acae Adjust text positions and sizes 
CURA-4215
 2017-09-12 16:01:57 +02:00
alekseisasin
48cda42ece Adjusted scale factor 
CURA-4215
 2017-09-12 15:49:00 +02:00
fieldOfView
65a339ed3d Merge branch 'master' into feature_plate_shader 
# Conflicts:
#	resources/themes/cura/theme.json
 2017-09-12 15:09:57 +02:00
fieldOfView
4c9028b3d0 Remove z-fighting kludge 
This was actually introducing z-fighting artefacts with the new shader and no added geometry.
 2017-09-12 15:06:06 +02:00
Eloi Pardo
1aa46045af add ConvexHullDecorator when grouping 2017-09-12 08:42:17 +02:00
fieldOfView
ec6fa19d4e Updated copyright date 2017-09-11 23:49:16 +02:00
fieldOfView
6658e1a9ae Draw grid lines using shader 2017-09-11 23:41:10 +02:00
fieldOfView
a4aa134f25 Revert "Merge branch 'feature_grid_lines'" 
This reverts commit a0b7a2d165, reversing
changes made to db640c6f3d.

# Conflicts:
#	cura/BuildVolume.py
 2017-09-11 22:43:55 +02:00
Lipu Fei
88e971ea92 Add new splash window 
CURA-4215

- New splash window background image
- Rotating loading circle on the splash window
 2017-09-11 18:13:12 +02:00
Lipu Fei
4507f6c8e2 Update job name prefix when machine is changed 
CURA-4305
 2017-09-11 12:39:59 +02:00
Mark
0a5744b74b Tweaked the update setting 
CURA-4301
 2017-09-11 11:21:31 +02:00
Ruben D
1e3cfc56be
Revert "CuraApplication: Minor pep8 fix" 
This reverts commit ee1ba30d0e.
 2017-09-10 16:55:24 +02:00
Diego Prado Gesto
c3d6023418 Fixed an issue that doesn't generate the jobname again once the user removes the models. - CURA-4276 2017-09-08 16:22:45 +02:00
Lipu Fei
b0916e4b67 Fix job name mismatching 
CURA-4276
 2017-09-06 18:09:19 +02:00