1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-29 12:10:34 +01:00
Commit Graph

19 Commits

Author SHA1 Message Date
Dorian Wouters
ca2357e423
Revert mff_classic 2016-08-21 22:39:12 +02:00
Dorian Wouters
dcc1873cbe
Move MFF-only craft recipes, craftitems, mapgen to [mff_classic]
Also fixes aliasing...
2016-08-21 13:26:16 +02:00
Dorian Wouters
ab71609bad
[default] Upate to upstream, move some edits out to [_misc] 2016-08-10 21:58:17 +02:00
LeMagnesium
e3e8de8b10 [moreores & mff_game] Fuse moreores and mff_game together 2016-04-27 16:19:14 +02:00
LeMagnesium
de031dddf1 MinetestForFun Game : Update all (but doors)
- Everything is updated, except doors
 - Some textures are moved to other mods (removed from default, but still used by those mods)
2016-04-09 21:56:43 +02:00
LeMagnesium
874f854688 [minetestforfun_game] Update
- Add new tree
- Creative mod improved
- New schematic files
2016-01-15 19:39:01 +01:00
LeMagnesium
01dea59dd5 [minetestforfun_game] Update 2015-10-21 14:06:13 +02:00
LeMagnesium
9eaff838e5 Updated MinetestForFun Game
- Moved farming and screwdriver into MinetestForFun Game
 - Updated files (mostly `is_ground_content`)
 - Removed weird partial copy of jukebox in MinetestForFun Game
2015-06-18 13:22:23 +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
Ombridride
bd37f19662 Change rights in the repository (755) 2015-05-26 23:37:16 +02: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
Ombridride
b0871dfe0f Reverse bad update from minetest_game
- game.conf (MAJ OK)
- default/boat/ (MAJ OK)
- craftitems.lua (MAJ OK)
- furnace.lua (not tweaked because it’s a total rewrite from
minetest_game)
- init.lua (petites modifs et remise du son/texte à la connexion de
nouveaux joueurs)
- player.lua (reprise des modifs de carbone sur l’animation du
personnage)
- tools.lua (on remet l’ancien)
- default/doors (MAJ OK, crafts modifiés)
- default/dye (MAJ OK)
- default/fire (MAJ OK)
- default/stairs (MAJ OK)

Mg, c’est à faire :
- default/textures/ (j’ai fait une bêtise, faut remettre les textures
grass/grass_side du minetest_game, et le water/water animated de
carbone)
2014-12-09 13:17:31 +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
Ataron
6af63a7e5d Enlevement du silver et du tin deja existants dans moreores 2014-11-14 18:47:49 +01:00
Ombridride
232b274c55 initial commit
subgame + mods
2014-10-28 18:01:32 +01:00