3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
10749 commits 305 branches 270 tags 779 MiB
Commit graph

10749 commits

This branch
This branch
All branches
Author SHA1 Message Date
ChrisTerBeke
7cc8656be3 Merge branch 'master' into CURA-4203-message-redesign 2017-09-12 09:13:37 +02:00
ChrisTerBeke
4143effbe1 only show slider track when layers are available 2017-09-12 09:13:16 +02:00
Lipu Fei
ed6adeabe9 Merge pull request #2416 from fieldOfView/fix_topbar_monitor_hover 
Fix hover state of Monitor button in the topbar
 2017-09-12 08:54:23 +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
fieldOfView
461d4be310 Fix hover state of Monitor button in the topbar 2017-09-11 20:35:24 +02:00
Tim Kuipers
be6dcdafbd lil: explicitly set cross infill density 2017-09-11 18:34:28 +02:00
Tim Kuipers
a8ff1e188f feat: Cross infill types and zig_zaggify_infill 2017-09-11 18:34:28 +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
1d38193bcd Fix letter 'r' alignment in logo 
CURA-4215

The letter 'r' in the logo was not aligned properly.
 2017-09-11 18:05:19 +02:00
alekseisasin
637b536536 Merge pull request #2342 from hroncok/localefix 
Relocate locales to proper locations
 2017-09-11 17:23:12 +02:00
ChrisTerBeke
cd3d4dc80f CURA-4203 updated message style for light theme, add shadows 2017-09-11 16:58:07 +02:00
ChrisTerBeke
89cbaca257 Hide layer view toolset when in monitoring mode 2017-09-11 15:20:46 +02:00
ChrisTerBeke
bd0b145036 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 15:08:10 +02:00
ChrisTerBeke
485b71c010 top bar improvements 2017-09-11 15:08:06 +02:00
Mark
af3b799cfa Renamed the views to * view 
CURA-4212
 2017-09-11 14:23:32 +02:00
Lipu Fei
4507f6c8e2 Update job name prefix when machine is changed 
CURA-4305
 2017-09-11 12:39:59 +02:00
ChrisTerBeke
7efe3a3b9e Merge branch 'master' into feature_top_right_layer_view 2017-09-11 11:50:18 +02:00
Lipu Fei
a041d005fa Merge pull request #2335 from fieldOfView/fix_simple_mode_disabled_features 
Hide adhesion & support options if they are disabled
 2017-09-11 11:43:48 +02:00
ChrisTerBeke
9623ed75ac Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 11:36:04 +02:00
ChrisTerBeke
005b43cc5d CURA-4148 small fixes for layer view settings panel 2017-09-11 11:35:40 +02:00
Lipu Fei
08882a3f12 Fix LayerView text colour 
CURA-4212
 2017-09-11 11:26:22 +02:00
Lipu Fei
f4bfa499d4 Remove debugging line 
CURA-4284
 2017-09-11 11:23:33 +02:00
Mark
a9cc10dd7b Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-11 11:21:41 +02:00
Mark
0a5744b74b Tweaked the update setting 
CURA-4301
 2017-09-11 11:21:31 +02:00
Lipu Fei
94a8d2dfc6 Fix LayerView text colour 
CURA-4212
 2017-09-11 11:15:56 +02:00
ChrisTerBeke
98babfade7 CURA-4284 remove debug logging 2017-09-11 11:11:45 +02:00
Lipu Fei
e26be6b14a Merge remote-tracking branch 'master' 2017-09-11 11:11:24 +02:00
Lipu Fei
96678b11ca Update LayerView slider according to new style 
CURA-4212
 2017-09-11 11:10:56 +02:00
ChrisTerBeke
8a518ff610 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 10:56:41 +02:00
ChrisTerBeke
5c30658012 CURA-4284 fix relationship dependencies in per object settings 2017-09-11 10:56:34 +02:00
Lipu Fei
09bb090cd9 Change setting_control_text to almost black colour 
CURA-4148
 2017-09-11 10:53:17 +02:00
Lipu Fei
327c84d9ef Change tool panel and checkbox text colours 
CURA-4148

- Change tool panel background colour to white
- Change checkbox text colour to almost black
 2017-09-11 10:48:31 +02:00
Lipu Fei
b2eead7736 Resolve merge conflicts from master 
CURA-4212
 2017-09-11 10:32:34 +02:00
Lipu Fei
f50255f1c9 Disable relative_extrusion for UMs 
CURA-4219
 2017-09-11 10:27:13 +02:00
Lipu Fei
ab6d90d0a7 Merge pull request #2308 from smartavionics/mb-relative-extrusion 
Add relative_extrusion setting to special modes category.
 2017-09-11 10:20:45 +02:00
ChrisTerBeke
5bb09d73fc clean 2017-09-11 09:46:37 +02:00
Diego Prado Gesto
b17ff081d6 Added the FirmwareUpdateChecker to Cura - CURA-4224 2017-09-11 09:35:27 +02:00
ChrisTerBeke
2d8fca8ac4 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 09:14:56 +02:00
ChrisTerBeke
d802c0bd26 CURA-4284 some code cleanup while debugging 2017-09-11 09:14:50 +02:00
Lipu Fei
546dc9ff4d Better positioning for the material circle in the ExtruderButton 2017-09-11 08:49:07 +02:00
Ruben D
1e3cfc56be
Revert "CuraApplication: Minor pep8 fix" 
This reverts commit ee1ba30d0e.
 2017-09-10 16:55:24 +02:00
Ruben D
234e724fe9
Merge branch 'fix_abort_sequence' of https://github.com/fieldOfView/Cura into fieldOfView-fix_abort_sequence 2017-09-10 15:10:11 +02:00
Ruben D
291d30f118
Update language preference in preferences when upgrading 
The language codes were all renamed, so they have to change in the .cfg file of the user as well.

Contributes to issue CURA-4263.
 2017-09-10 14:01:26 +02:00
Ruben D
08d0d90389
Change Pirate language to en_7S 
Since it's English from the seven seas.

Contributes to issue CURA-4263.
 2017-09-10 14:01:07 +02:00
Ruben D
48778a2801
Update language codes 
The folders were renamed, so they should get renamed here as well.

Contributes to issue CURA-4263.
 2017-09-10 14:00:57 +02:00
Ruben D
91c5da7054
Remove auto-generated file 
It should never have been committed.

Contributes to issue CURA-4263.
 2017-09-10 14:00:49 +02:00
Ruben D
46e4902df3
Ignore new en_US locale 
Contributes to issue CURA-4263.
 2017-09-10 14:00:37 +02:00