3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 02:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed conflits after merge with master

Browse source
This commit is contained in:
enricoturri1966 2020-12-04 12:33:44 +01:00
commit 7a54c4fdfe
20 changed files with 556 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libslic3r/Technologies.hpp
View file

@ -89,6 +89,7 @@
#define ENABLE_2_3_0_BETA2 1
#define ENABLE_ARROW_KEYS_WITH_SLIDERS (1 && ENABLE_2_3_0_BETA2)
#define ENABLE_NEW_NOTIFICATIONS_FADE_OUT (1 && ENABLE_2_3_0_BETA2)
#define ENABLE_PREVIEW_TYPE_CHANGE (1 && ENABLE_2_3_0_BETA2)