merge the actual useful, sane appearing changes from DNC. the changes to the crafting system and packet settings may not be so good

This commit is contained in:
CodeCodon
2015-08-02 17:10:04 -05:00
parent 3a13a83ee3
commit 3668521963
16 changed files with 142 additions and 154 deletions
@@ -124,7 +124,7 @@ FileStreamer::File *FileStreamer::open(const char *fileName, bool randomAccess)
reportModDirectory(fileName, "music/", "Music") ||
reportModDirectory(fileName, "sound/", "Sound") ||
reportModDirectory(fileName, "camera/", "Camera"); // ||
//reportModDirectory(fileName, "shader/", "Shader");
reportModDirectory(fileName, "shader/", "Shader");
#endif
// return the opened file