1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-05 10:00:26 +01:00
server-nalc/worlds
LeMagnesium 50802588f0 Merge of 'solarmana_add'
Conflicts:
	mods/WorldEdit/worldedit/init.lua
	mods/WorldEdit/worldedit/manipulations.lua
	mods/WorldEdit/worldedit_commands/init.lua
	mods/WorldEdit/worldedit_commands/safe.lua
	mods/compassgps/README.md
	mods/mobs/api.lua
	mods/mobs/chicken.lua
	mods/mobs/cow.lua

This branch was completly f*cked up, we couldn't find a way to update it without throwing piles of merge conflicts, even with patches.
Runes are defaultly disabled. The README.md file will be updated, as well as many files in the repository
2015-05-22 20:09:39 +02:00
..
minetestforfun Merge of 'solarmana_add' 2015-05-22 20:09:39 +02:00