3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
10227 commits 313 branches 275 tags 719 MiB
Commit graph

2304 commits

Author SHA1 Message Date
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
alekseisasin
c614f02d0f Fixed settings update. After each change in the settings the build volume was rebuilding 
CURA-4271
 2017-09-06 16:58:17 +02:00
Lipu Fei
fc7207e77e Remove "Sync" button 
CURA-4211
 2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d Update extruder button styles 
CURA-4211
 2017-09-06 12:00:53 +02:00
Jaime van Kessel
8472830fb9 Fix adding machine prefix 
CURA-4276
 2017-09-05 13:30:42 +02:00
Jaime van Kessel
204e1ee834 PrintJobname is now only set when it was empty or if it's set to empty 
CURA-4276 fixes #2346
 2017-09-05 11:41:30 +02:00
Lipu Fei
e9551d2173 Add upgrade script for 2.7 to 3.0 
CURA-4270

Changes for the Skin Pre-shrink settings requires upgrade.
 2017-09-04 15:39:10 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Vivek Anand
ee1ba30d0e CuraApplication: Minor pep8 fix 2017-09-02 12:01:38 +00:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
Ghostkeeper
b677a81d9b
Change default theme 
This new field is now read by Uranium that indicates the default theme to load first before there are any changed preferences.

Contributes to issue CURA-4148.
 2017-08-30 16:08:49 +02:00
Lipu Fei
23544ad1fe Only fall back to use fdmprinter when the quality profiles for the current machine cannot be found 
CURA-4139

UM2 family don't have machine material, but they do have their dedicated
profiles. When Cura searches for quality profiles, it should only fall
back to use "fdmprinter" as the definition if no quality profile can be
found for the current machine.
 2017-08-30 14:59:12 +02:00
Lipu Fei
0eb63637d4 Merge branch 'master' into feature_dark_colours_icons 2017-08-28 16:54:36 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Lipu Fei
b84500f742 Import Application instead of inline import CuraApplication 
CURA-4186
 2017-08-28 14:35:36 +02:00
Lipu Fei
37414e7bc7 Fix code style: double quotes instead of single quotes 
CURA-4186
 2017-08-28 14:34:53 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons 
CURA-4148

Resolve merge conflicts.
 2017-08-28 11:13:38 +02:00
Ghostkeeper
585c04dfaa
Also show warning icon when the set-up on other extruders is unsupported 
So I added a function that checks the support on all extruders and the global stack.

Contributes to issue CURA-4148.
 2017-08-25 14:27:45 +02:00
Lipu Fei
141aad5513 Trigger to re-evaluate default settings in per-object settings when the active stack gets changed. 
CURA-4186

Trigger signals to re-evaluate default settings in pre-object settings
when the active stack gets changed. Otherwise the values won't be
updated directly.
 2017-08-25 12:48:47 +02:00
Lipu Fei
a320784a6d For a per-object setting, use the user-defined value first 
CURA-4186

In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
 2017-08-25 12:19:05 +02:00
Lipu Fei
c44e527305 Remove warning in /PerObjectContainerStack 
CURA-4186
 2017-08-25 11:57:52 +02:00
Lipu Fei
50a7e8146f Add a dedicated stack class for per-object settings 
CURA-4186

Add a dedicated stack class PerObjectContainerStack for per-object
settings to evaluate limit_to_extruder values correctly.
 2017-08-24 17:09:28 +02:00
Lipu Fei
365379f735 Add missing context in getProperty() in global and extruder stacks 
CURA-4186

All getProperty() calls should use the provided context.
 2017-08-24 17:01:03 +02:00
Lipu Fei
759d44dbef Add stack context for function evaluation 
CURA-4186
 2017-08-23 14:39:08 +02:00
Jaime van Kessel
904682945a Decreased the value of the u_z_bias, so the plate quad is drawn again. 
CURA-4150
 2017-08-23 12:48:19 +02:00
fieldOfView
32a863d9dc Find a material with the correct diameter when adding a printer 2017-08-23 11:13:36 +02:00
Jaime van Kessel
ca1f7430c1 Merge branch 'fix_add_machine_material_diameter' of https://github.com/fieldOfView/Cura 2017-08-23 11:11:45 +02:00
alekseisasin
9363f93467 Merge pull request #2224 from fieldOfView/fix_multiextruder_menus 
Fix multiextruder menus
 2017-08-23 09:08:48 +02:00
Ghostkeeper
03311132f0
Merge branch 'feature_grid_lines' 2017-08-22 16:41:45 +02:00
Ghostkeeper
18b88065f4
Render build plate slightly lower than grid to prevent Z fighting 
Looks much better.

Contributes to issue CURA-4150.
 2017-08-22 16:40:11 +02:00
alekseisasin
a0b7a2d165 Merge branch 'feature_grid_lines' 
CURA-4150
 2017-08-22 13:59:19 +02:00
Ghostkeeper
25c5c5a888
Add minor grid cells for circular build plates 
Same technique as the major grid cells.

Contributes to issue CURA-4150.
 2017-08-21 10:24:53 +02:00