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

36 Commits

Author SHA1 Message Date
Dorian Wouters
ca2357e423
Revert mff_classic 2016-08-21 22:39:12 +02:00
Dorian Wouters
5f17957058
Move our [default] edits to mff_classic, alias nodes 2016-08-20 21:19:10 +02:00
Dorian Wouters
947b301456
Move minetest.rotate_node() edit to [_misc]
DON'T edit mods directly if it's possible to override them, or if
the edit has no relation to that specific mod (which was the case).

This reverts commit 3752bf2e64.
2016-08-14 11:31:58 +02:00
3752bf2e64 rewrite minetest.rotate_node() to auto refill inventory on place node, issue https://github.com/MinetestForFun/server-minetestforfun/issues/462 2016-08-14 00:31:58 +02:00
Dorian Wouters
ab71609bad
[default] Upate to upstream, move some edits out to [_misc] 2016-08-10 21:58:17 +02:00
b9e4aba33c readd new fence code 2016-05-24 20:47:14 +02:00
9b48d2ce29 revert fence (don't work on 0.4.13-stable) 2016-04-17 14:20:07 +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
5f182101eb [default/nodes] Cleaner fix for leaves drop 2015-12-14 18:31:58 +01:00
LeMagnesium
2b478b5b32 [MFFGame] Updates 2015-11-23 18:39:26 +01:00
LeMagnesium
95afbebdd9 [default] Use moretrees:palm_trunk to control palm leaves' decay 2015-10-12 19:14:35 +02:00
Gael-de-Sailly
8b5d0fe0fa Use default:dirt_with_dry_grass 2015-08-31 12:11:53 +02:00
LeMagnesium
2df673dc17 Drop items when leaves decay 2015-08-25 16:11:01 +02:00
LeMagnesium
d32753ab3d Fixes mistakes during previous merge
- Solves #220
2015-08-15 22:29:42 +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
56161ae978 commented our modiff 2015-07-25 18:46:56 +02:00
65b7e44175 fixed catus grow on watershed:drygrass 2015-07-25 01:49:41 +02:00
523251abf1 fixed papryrus grow on default:sand and default:desert_sand, remove papyrus abm neighbors "dirt_with_snow"
remove deplicated fonction minetest.remove_node() (minetest.remove_node==minetest.set_node) in on_placenode() callback for torch
2015-07-18 18:50:57 +02:00
bb6be97c04 Default/functions: Fix cacti not growing when rotation is 1-3 2015-07-03 20:28:22 +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
e1ebbe9b1e Finished merge of nodes.lua from Minetest Game 2015-06-14 11:46:11 +02:00
LeMagnesium
2913bcb93d Removed all whitespaces (using new script) 2015-06-10 19:12:48 +02:00
Ombridride
bd37f19662 Change rights in the repository (755) 2015-05-26 23:37:16 +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
0e05ac226a Fix typo in survival form spec & create legacy file
(from MT_game)
2015-03-03 20:06:59 +01:00
639584ec06 callback for torches in water 2015-03-03 00:19:08 +01:00
Ombridride
a806d9b55b Tweak growing chance of cactus and papyrus
- 1 tick / minute
- 25% chance of growth / tick
2014-12-15 03:07:32 +01:00
LeMagnesium
7126d2af7f Merge "Set param2 to 1 if player places leaves" 2014-12-14 23:53:42 +01:00
LeMagnesium
57b2df5054 Merge various fire's bug fixs and doors textures 2014-12-14 22:33:57 +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
4de7f3e484 Let's do a step forward
- Commits :
	b0871dfe0f (Not really because the reverts were done in my last commit)
	c1043f0120
	35a13c8faf
	6679190d44
	eae0c1bc2e
	ef566a5fe1
	85bd085ab8
	254ec74625
	99feb28ec3
	d6b270e197
	b4a95f223f
	69d4d5dcad
	d7a5dcbb29
	48dd18d49a
	8c2391d5ac
  Are done again. (Ok, no all of them only those concerning default and reverted mods)

TODO: Still missing the three next commits

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-12-10 17:04:10 +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
c1043f0120 merge the functions.lua update
functions.lua :
- abm des cactus et papyrus modifiées (la pousse est plus lente)
- abm des papyrus modifiée (ne pousse que sur la dirt/dirt with grass)

(Le reste c’est des prises de Carbone)
2014-12-09 13:32:48 +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
232b274c55 initial commit
subgame + mods
2014-10-28 18:01:32 +01:00