1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-25 10:15:50 +00:00

Fixed conflicts after merge with master

This commit is contained in:
enricoturri1966
2020-11-24 13:37:52 +01:00
32 changed files with 6257 additions and 4486 deletions
+1
View File
@@ -79,6 +79,7 @@
//===================
#define ENABLE_2_3_0_BETA1 1
#define ENABLE_SHOW_WIPE_MOVES (1 && ENABLE_GCODE_VIEWER && ENABLE_2_3_0_BETA1)
#define ENABLE_DRAG_AND_DROP_FIX (1 && ENABLE_2_3_0_BETA1)
#endif // _prusaslicer_technologies_h_