Lipu Fei 94e89ad4ac Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

..

bundled_packages

Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

definitions

Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

extruders

Add Cubicon plus A15 and A30

2019-09-12 14:05:13 +02:00

i18n

Fix percentages using fullwidth font

2019-09-23 12:06:41 +02:00

images

Move profiles from pr-data to main Cura repository

2019-09-04 09:16:22 +02:00

intent

Add missing newline

2019-09-23 14:49:04 +02:00

meshes

Commit actual files instead of my symlinks

2019-09-04 09:23:27 +02:00

qml

Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

quality

Fix merge conflicts with master

2019-09-24 14:26:43 +02:00

setting_visibility

Add Z Seam Position in Expert View

2019-09-10 13:36:10 +02:00

shaders

Older drivers can lie w.r.t. GLSL-version if it's forced lower.

2019-09-21 14:58:59 +02:00

texts

Removed PPA entries from the changelog

2019-09-20 11:31:12 +02:00

themes

Styling: do not use thick_lining for selected tool icons.

2019-09-18 11:23:10 +02:00

variants

Fix merge conflicts with master

2019-09-24 14:26:43 +02:00