Merge branch 'master' into fnode-redo

diff --cc engine/init.js
index f09e44a670784a747246d13344581badc37cbfd0,26977659ef6b56af8c3c72707dfc976ed0be8cc4..79703e68461aced9c53e0faf42ffe5b9a605460a
--- 1/engine/init.js
--- 2/engine/init.js
+++ b/engine/init.js
@@@ -161,7 -161,7 +161,7 @@@ dragonblocks.loadMod = function(modname
        dragonblocks.loadedMods.push(modname);
        dragonblocks.loadingMods[modname] = false;
  }
- dragonblocks.modules = ["ressources", "key_handler", "gui", "mapgen", "world", "item", "node", "tool", "group", "builtin", "map_node", "map", "itemstack", "inventory", "inventory_group", "hudbar", "inventory_container", "creative_inventory", "recipe", "craftfield", "menu", "skin", "entity", "map_interaction", "spawned_entity", "falling_node", "timer", "player", "pixel_manipulator", "chat", "chatcommands", "mainmenu"];
 -dragonblocks.modules = ["ressources", "key_handler", "gui", "mapgen", "world", "item", "node", "tool", "group", "builtin", "map_node", "map", "itemstack", "inventory", "inventory_group", "hudbar", "inventory_container", "creative_inventory", "recipe", "craftfield", "menu", "skin", "entity", "map_interaction", "spawned_entity", "item_entity", "timer", "player", "pixel_manipulator", "chat", "chatcommands", "mainmenu"];
++dragonblocks.modules = ["ressources", "key_handler", "gui", "mapgen", "world", "item", "node", "tool", "group", "builtin", "map_node", "map", "itemstack", "inventory", "inventory_group", "hudbar", "inventory_container", "creative_inventory", "recipe", "craftfield", "menu", "skin", "entity", "map_interaction", "spawned_entity", "item_entity", "falling_node", "timer", "player", "pixel_manipulator", "chat", "chatcommands", "mainmenu"];
  dragonblocks.moduleCount = dragonblocks.modules.length;
  dragonblocks.loadModule = function(){
        if(dragonblocks.modules[0]){