Fix build after merge
Merge remote-tracking branch 'minetest/master'
Merge remote-tracking branch 'upstream/master' into next
Don't include cmake_config_githash.h into files that don't need it
Try to fix windows loadblock crash
Merge remote-tracking branch 'minetest/master'

Conflicts:
	src/convert_json.cpp
Merge remote-tracking branch 'upstream/master' into next
more_threads=1 on windows
Merge remote-tracking branch 'upstream/master' into next
update games/default
Lock leveldb and dummy dbs
sqlide db lock
Merge remote-tracking branch 'upstream/master' into next
Windows: Fix VS build.
Convert TOSERVER_INVENTORY_ACTION.
Convert TOSERVER_INVENTORY_FIELDS
Convert TOSERVER_INTERACT.
Convert TOSERVER_CLIENT_READY.
Fix mapgen selection in menu (very hacky, I'm a bit sorry), fixes #102, #98.
Convert TOCLIENT_EYE_OFFSET.