HomeAleph Objects Inc

Merge branch 'paukstelis-feature_mesh_names'

Authored by Ghostkeeper on Sep 28 2018, 5:47 AM.

Description

Merge branch 'paukstelis-feature_mesh_names'

Conflicts:
src/FffGcodeWriter.cpp
src/LayerPlan.cpp
src/LayerPlan.h
src/commandSocket.cpp
src/mesh.h
src/pathPlanning/GCodePath.cpp
src/pathPlanning/GCodePath.h
src/sliceDataStorage.h

Lots of conflicts due to engine settings refactor.

Contributes to issue CURA-5664.

Details

Committed
GhostkeeperSep 28 2018, 5:47 AM
Pushed
victor_larchenkoDec 4 2018, 4:17 AM
Parents
rCTEdd551e3fd696: Replace tab by spaces
rCTE91a1269c4ddb: Remove simple X move test
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
dd551e3fd696 Ghostkeeper
Replace tab by spaces 
Sep 28 2018
197885bfbfc1paukstelis
Re-enable non-mesh objects for towers etc. 
Sep 14 2018
b138304d0b15paukstelis
Remove extraneous logging 
Aug 20 2018
d78684c34fccpaukstelis
Initial commit for including mesh names as comments in gcode 
Aug 19 2018
440132104e66 Ghostkeeper
Add g-code comment for which mesh a g-code belongs to 
Jun 14 2018