1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-18 00:08:25 +01:00
Commit Graph

13 Commits

Author SHA1 Message Date
LeMagnesium
0faa14e2d5 Updated default and stairs
- Added alias for pine trees (consequence of the pine nodes changing name)
 - Added new textures for foosteps and grass/grass_side
 - Updated default/README.txt
 - Updated default/nodes.lua
2015-08-16 10:57:01 +02:00
LeMagnesium
5b4172541b Updated moretrees, plantlife, and MinetestForFunGame
- Solves #220
 - Merge mapgen into MinetestForFun Game
 - Merge acacia support in moretrees
 - Add 3dmushrooms mod (world.mt updated)
2015-08-15 22:17:07 +02:00
LeMagnesium
12501fb1cd Merged most of default
- Merged README, crafting, functions, furnace, init, mapgen, nodes, tools and trees
2015-06-14 11:46:12 +02:00
LeMagnesium
baa7b8875b Updated minetestforfun_game
- Added default:meselamps
 - Added shelf:vessel
 - Merged cactus/papyrus override possibility
2015-05-01 14:38:17 +02:00
Ombridride
31f8354649 Update MFF_game "README" again 2015-03-03 19:45:50 +01:00
Ombridride
8f5dd6e2e6 update MFF_game "README.txt" 2015-03-03 19:44:20 +01:00
LeMagnesium
a921fb4b97 Merge... some random commits 2014-12-15 00:04:45 +01:00
Ombridride
887473124e Merge server to github 2014-12-11 18:53:00 +01:00
LeMagnesium
8b3abd1b43 Rollback again, something is crashing the server.. 2014-12-10 23:31:28 +01:00
LeMagnesium
2155ecc638 OK, ROLLBACK!
- All the modifications done before 7845fd5f1f are reverted
- Merged commits from http://github.com/minetest/minetest_game from 10 days ago to today. (concerning default mod)

TODO: Merge the other mods which have been reverted.
      Add all the commits of Ombridride after the 7845fd5f1f one.

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-12-10 16:49:14 +01:00
LeMagnesium
b8a1cac0cb Update minetestforfun_game with minetest_game
- I hope there is no problem. I see a lot of new stuff in the vanilla
  game. I keep a backup on another computer to restore the state of the
  repository if there is a problem.
2014-12-08 22:44:21 +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