- Added river water (alias in mapgen.lua and registrations in nodes.lua) - Reorganized aliases in mapgen.lua as they are in minetest_game to make further merges simplier - Updated news.txt