5 Commits

Author	SHA1	Message	Date
Ombridride	de4b1ac9ff	Update nodes.lua	2015-03-04 00:31:41 +01:00
crabman77	7a102d8a32	resolve conflict straw ... resolve conflict darkage:straw and farming:straw Use darkage:straw if not mod farming else use farming:straw	2015-03-03 21:18:02 +01:00
Ombridride	887473124e	Merge server to github	2014-12-11 18:53:00 +01:00
Ombridride	2e895a7790	Merge server with github repository ... Pas mal de changement n’ont pas été pushé sur le github du serveur, voici l’occasion de faire une bonne synchronisation :)	2014-11-16 22:23:16 +01:00
Ombridride	232b274c55	initial commit ... subgame + mods	2014-10-28 18:01:32 +01:00