luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-23 12:45:43 +02:00
Code Activity

Merge branch 'upstream/master'

Browse Source 
Conflicts:
	data/oerkki1.png
	src/client.cpp
This commit is contained in:
Nils Dagsson Moskopp
2011-07-14 22:43:22 +02:00
parent 5146c826be 81535f6277
commit 3560f0de08
53 changed files with 3330 additions and 2841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/content_inventory.cpp
View File

@@ -19,8 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_inventory.h"
#include "inventory.h"
#include "serverobject.h"
#include "content_mapnode.h"
//#include "serverobject.h"
#include "content_sao.h"
bool item_material_is_cookable(u8 content)
{