Aleksei S
ce0510cee3
Hide icons if they overlap monitor button
...
CURA-4527
2017-11-15 16:34:22 +01:00
Andreea Scorojitu
9bcc4da4a1
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-15 13:40:56 +01:00
Andreea Scorojitu
7aeaf661ae
Change_Color_UI_elements_CURA-4548
2017-11-15 13:40:46 +01:00
Ruben D
8dd91519a6
Move Support Chunk Size out of children of skip_some_zags
...
The rule is that leaf settings are the ones that are used by the engine. The support_skip_some_zags setting is used by the engine.
2017-11-15 00:54:08 +01:00
Aleksei S
3d2868c336
Added icons
...
CURA-4527
2017-11-15 00:43:17 +01:00
MaukCC
b081b686a8
Merge branch 'master' into cura/Cura/master
2017-11-14 11:59:35 +01:00
MaukCC
38882c6d13
Update cartesio.def.json
2017-11-14 10:53:51 +01:00
maukcc
ef2d9b0468
Cartesio profiles
...
updated prime tower
update PC profiles
2017-11-14 10:30:10 +01:00
Diego Prado Gesto
1008789364
Merge branch 'master' into print_simulation_view
2017-11-13 11:28:27 +01:00
Diego Prado Gesto
720b9ebdfa
CURA-4556 Add profiles for AA0.25 and BAM material
2017-11-13 11:06:27 +01:00
Ruben D
6d05c320a8
Remove disfunctional initial layer z offset settings
...
The pull request for the engine wasn't merged. It looks like the pull request for the front-end settings wasn't merged either, but here they are. They shouldn't be here.
Fixes #2744 .
2017-11-11 17:51:33 +01:00
ChrisTerBeke
88cf40e2d7
Merge branch 'master' into container_stack_improvements
2017-11-10 14:35:13 +01:00
fieldOfView
e00ac591bf
Use material color for cutting_mesh and infill_mesh
2017-11-10 12:24:32 +01:00
fieldOfView
8f8bdc059a
Render non-printing objects as semi transparent objects in Solid View
2017-11-09 12:55:03 +01:00
Andreea Scorojitu
723d593827
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-09 12:02:13 +01:00
Andreea Scorojitu
477e295e70
Change_Color_UI_elements_CURA-4548
2017-11-09 12:02:01 +01:00
Lipu Fei
637d1a1da3
Fix Vertex Delta K8800 definition file
2017-11-09 10:37:51 +01:00
Diego Prado Gesto
1ff2541947
Add nozzle color to the default themes
2017-11-09 10:34:35 +01:00
Lipu Fei
b0144c7f10
Merge pull request #2740 from kaleidoscopeit/master
...
New machine definition : Deltacomb 3D
2017-11-09 10:33:53 +01:00
kaleidoscopeit
714c0f25da
Set all "setting_version" in qualitites to 4
2017-11-09 10:25:30 +01:00
Andreea Scorojitu
d6f856e900
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-09 08:47:09 +01:00
Lipu Fei
183c63f765
Merge pull request #2720 from Ultimaker/Update_Infill_Patern_Description
...
Add_tri-hexagon_and_cross_to_pattern_description
2017-11-09 08:14:35 +01:00
Andreea Scorojitu
d8d738be25
Change_Color_UI_elements_CURA-4548
2017-11-08 17:02:49 +01:00
Brecht Nuyttens
873862efd7
Fixed Vertex Delta Definition
2017-11-07 16:54:18 +01:00
Aleksei S
6e7e859a0a
Introduced Lock Position functionality
...
CURA-4527
2017-11-07 10:59:23 +01:00
Aleksei S
7722e438c9
Changed orientation button location, adjusted call functins
...
CURA-4527
2017-11-06 10:28:07 +01:00
kaleidoscopeit
5008d63cfe
New machine definition : Deltacomb 3D
2017-11-06 10:01:57 +01:00
ChrisTerBeke
d32b7f0091
Merge branch 'master' into container_stack_improvements
2017-11-06 09:49:44 +01:00
Ruben D
0d71443bd2
Move 'Remove Empty First Layers' setting to mesh fixes category
...
It used to be in 'support' since it's something you may want to decide on depending on whether you have support or not. It could also go in 'Special Modes', but I think this is more specified.
2017-11-05 23:24:07 +01:00
Aleksei S
fb8bde6f76
Added view rotation for each click
...
CURA-4527
2017-11-03 15:29:33 +01:00
Andreea Scorojitu
1d5d8c5ac0
Add_tri-hexagon_and_cross_to_pattern_description
2017-11-03 15:02:03 +01:00
Diego Prado Gesto
a4441e2bdb
CURA-4481 Setting description improved
2017-11-02 13:20:25 +01:00
Ghostkeeper
202f7f87f8
Remove ID from definition files
...
Sometimes it's out of sync. Sometimes even missing. Let's just not use that any more.
Contributes to issue CURA-4243.
2017-11-02 12:53:06 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging
...
Jogging
2017-11-01 16:15:40 +01:00
Aleksei S
87a7bf72a8
Monitor view, "connect" button position
...
CURA-4509
2017-11-01 15:57:30 +01:00
ChrisTerBeke
4326884f97
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-01 15:54:43 +01:00
alekseisasin
db51054984
Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area
...
Cleanup save/monitor button area
2017-11-01 15:53:20 +01:00
ChrisTerBeke
e2c62a4609
Revert "Remove unnecessary properties which after update triggered view rendering"
...
This reverts commit ee228155af
2017-11-01 15:50:23 +01:00
Diego Prado Gesto
7f76749e2c
Merge branch 'CURA-4062_layerview_laggy'
2017-11-01 13:37:44 +01:00
ChrisTerBeke
743285f426
Merge branch 'master' into container_stack_improvements
2017-11-01 12:32:37 +01:00
Mark
512541be08
Change the font of the checkbox
...
CURA-4503
2017-11-01 10:44:46 +01:00
alekseisasin
fb87b73bbe
Merge pull request #2591 from BagelOrb/trihex_infill
...
trihex infill
2017-10-31 17:25:31 +01:00
ChrisTerBeke
7a8d562234
Merge branch 'master' into container_stack_improvements
2017-10-31 16:24:05 +01:00
Lipu Fei
324b39fc39
Fix layout for open project dialog
...
CURA-4503
2017-10-31 16:20:01 +01:00
ChrisTerBeke
e7f1900f71
Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482
2017-10-31 14:01:15 +01:00
alekseisasin
759c494aaa
Merge pull request #2703 from fieldOfView/fix_setting_text_on_focus
...
Stop SettingTextField from setting values when getting/losing the focus
2017-10-31 12:47:25 +01:00
Aleksei S
f1db8ed001
Show message (hover slieder) if user selected custom quality profile in recomended mode
...
CURA-4466
2017-10-31 11:07:45 +01:00
Aleksei S
f7ce4cc78a
Merge branch 'master' of github.com:Ultimaker/cura
2017-10-31 10:27:35 +01:00
Aleksei S
e0c1afe01f
Added Request package information to AboutDialog.qml
...
CURA-4415
2017-10-31 10:26:42 +01:00
ChrisTerBeke
4701518404
Add default position to fdm extruder definition - CURA-4482
2017-10-31 10:23:30 +01:00
