MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ab9rf/develop' (labormanager) into develop

develop
lethosor 2016-08-11 23:37:22 -04:00
parent 1a79e7456c a55ce5f1d9
commit bceeea39ba
2 changed files with 628 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/devel/CMakeLists.txt
Unescape Escape View File

@ -3,13 +3,13 @@ DFHACK_PLUGIN(vectors vectors.cpp)
endif()
ADD_DEFINITIONS(-DDEV_PLUGIN)
#DFHACK_PLUGIN(autolabor2 autolabor2.cpp)
DFHACK_PLUGIN(buildprobe buildprobe.cpp)
DFHACK_PLUGIN(color-dfhack-text color-dfhack-text.cpp)
DFHACK_PLUGIN(counters counters.cpp)
DFHACK_PLUGIN(dumpmats dumpmats.cpp)
DFHACK_PLUGIN(eventExample eventExample.cpp)
DFHACK_PLUGIN(frozen frozen.cpp)
DFHACK_PLUGIN(labormanager labormanager.cpp)
DFHACK_PLUGIN(kittens kittens.cpp)
DFHACK_PLUGIN(memview memview.cpp)
DFHACK_PLUGIN(nestboxes nestboxes.cpp)

900
plugins/devel/autolabor2.cpp → plugins/devel/labormanager.cpp
View File

File diff suppressed because it is too large Load Diff