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

943 Commits

Author SHA1 Message Date
LeMagnesium
276d0c46cd Added plate runes
- Added plate template for runes
 - Added on_punch API's handler's function
 - Added popper rune
2015-05-17 20:21:42 +02:00
LeMagnesium
b5dd375533 Added base of runes mod
- Added rune API's first implementation
 - Added basic cubic runes in solarmana
2015-05-17 20:21:01 +02:00
LeMagnesium
4777fe8e86 Added group support for solarmana 2015-05-17 20:19:59 +02:00
Ataron
21ac2da4ba Add some textures for runes mod 2015-05-17 20:19:31 +02:00
LeMagnesium
1dd71061e6 Added solarmana mod (first version) 2015-05-17 18:20:21 +02:00
Ataron
238558eed2 Megamana's and Gotome's Textures 2015-05-17 18:18:25 +02:00
LeMagnesium
4c40b51b9b Updated solarmana_add
- Updated solarmana_add/README.txt
 - Fixed indentation for groups handler
2015-05-17 18:18:23 +02:00
LeMagnesium
d211627e05 Added minotaur's eye
- Added minotaur eye craftitem (drop chances : 1/10 when killing a minotaur)
 - Fixed some amulets' name
2015-05-17 18:18:22 +02:00
LeMagnesium
a651f88919 Fixed names, added textures
- Fixed amulets' itemstring
 - Fixed modname prefixes for amulets
 - Added black magic block's texture
2015-05-17 18:16:54 +02:00
Ombridride
5072b85fb5 Update amulets mod
- Renamed amulets (delete some of them)
- Add Recipes
- Add a node (needed by a recipe)
- Add a texture for the node
2015-05-17 18:16:54 +02:00
LeMagnesium
b93bd0e00a Amulets/runes' inventory created with load and save features
- Added texture for the inventory's background to be customized later, adding
   copies of our textures in each slot
 - Added unified_inventory as a dependency for runes
 - Added inventory for runes and amulets and its handler
2015-05-17 18:16:54 +02:00
LeMagnesium
1413d905d2 Added triple registrering of runes
- Runes are registered three times with tree levels : minor, medium, major
2015-05-17 18:16:54 +02:00
LeMagnesium
d67d93a7ff Added work for "go to me" rune
- Added mana dicreaser on on_punch calls (cube only :s)
 - Added is_owner handler
 - Moved a texture name to the good name
 - Added values in needed_mana for go_to_me rune
2015-05-17 18:16:53 +02:00
Ataron
360deb8067 Add some textures for runes mod 2015-05-17 18:16:53 +02:00
LeMagnesium
275fbd4e09 Added plate runes
- Added plate template for runes
 - Added on_punch API's handler's function
 - Added popper rune
2015-05-17 18:16:53 +02:00
LeMagnesium
01c6adb660 Added amulets
- Added amulets' API
 - Added some amulets
2015-05-17 18:16:53 +02:00
LeMagnesium
ef6f0d3127 Added triple registrering of runes
- Runes are registered three times with tree levels : minor, medium, major
2015-05-17 18:16:53 +02:00
LeMagnesium
eae5700e6b Added work for "go to me" rune
- Added mana dicreaser on on_punch calls (cube only :s)
 - Added is_owner handler
 - Moved a texture name to the good name
 - Added values in needed_mana for go_to_me rune
2015-05-17 18:16:53 +02:00
LeMagnesium
274c874f35 Added plate runes
- Added plate template for runes
 - Added on_punch API's handler's function
 - Added popper rune
2015-05-17 18:16:53 +02:00
LeMagnesium
a074967763 Added mana max rune
- Added mane max rune
 - Fixed projection rune
2015-05-17 18:16:53 +02:00
LeMagnesium
3ea4880eb8 Added base of runes mod
- Added rune API's first implementation
 - Added basic cubic runes in solarmana
2015-05-17 18:16:53 +02:00
LeMagnesium
d2b3e73e0b Added group support for solarmana 2015-05-17 18:16:53 +02:00
LeMagnesium
d492cdb715 Added solarmana mod (first version) 2015-05-17 18:16:53 +02:00
Ataron
a49580f356 Add some textures for runes mod 2015-05-17 18:16:53 +02:00
LeMagnesium
22efc57bf1 Added plate runes
- Added plate template for runes
 - Added on_punch API's handler's function
 - Added popper rune
2015-05-17 18:16:53 +02:00
LeMagnesium
c15196fd0e Added mana max rune
- Added mane max rune
 - Fixed projection rune
2015-05-17 18:16:53 +02:00
LeMagnesium
af3bb78c3f Added base of runes mod
- Added rune API's first implementation
 - Added basic cubic runes in solarmana
2015-05-17 18:16:53 +02:00
LeMagnesium
19374b7057 Added group support for solarmana 2015-05-17 18:16:52 +02:00
LeMagnesium
d5dd382e87 Added solarmana mod (first version) 2015-05-17 18:16:52 +02:00
LeMagnesium
26b6b69f28 Fixed bracket in minotaur.
- Fixed a mistmatching bracket in mods/mobs/minotaur.lua
2015-05-17 11:48:23 +02:00
Ombridride
4fd5ced537 Update monsters
- Tweak the coins drop (only silver and gold now)
- Creeper no longer drop coins
- Fix minotaur mob
- Add and tweak yeti mob (spawn / drops / light damage)
- Update spreadsheet
- many other small tweaks
2015-05-16 22:30:02 +02:00
Ombridride
3e18e2d6d2 Fix minotaur mob problems 2015-05-16 20:45:24 +02:00
Ombridride
b89ca8c014 Fix minotaur problem dofile on init.lua 2015-05-16 19:09:49 +02:00
LeMagnesium
a32db0e243 Fixed inhibition of buckets because of homedecor's overwrite 2015-05-16 14:15:14 +02:00
LeMagnesium
165a9e070f No rotate needed for Minotaurs 2015-05-15 16:33:34 +02:00
LeMagnesium
e6203874a2 Removed staled sarangay.lua 2015-05-15 16:01:37 +02:00
LeMagnesium
548142b79b Updated pipeworks 2015-05-15 13:21:14 +02:00
LeMagnesium
da33df3e9c Updated nether mod 2015-05-15 13:21:03 +02:00
LeMagnesium
68b0ff7906 Updated mesecons 2015-05-15 13:20:53 +02:00
LeMagnesium
ecffdd20c8 Updated plantlife_modpack 2015-05-15 13:19:17 +02:00
LeMagnesium
212677382b Updated screwdriver (from minetest_game) 2015-05-15 13:19:03 +02:00
LeMagnesium
deae3cf088 Updated farming 2015-05-15 13:18:51 +02:00
LeMagnesium
2f14b03393 Removed tetris arcade (now included in homedecor) 2015-05-15 13:18:31 +02:00
LeMagnesium
a363690ff7 Updated homedecor 2015-05-15 13:18:20 +02:00
LeMagnesium
939aa7ae59 Updated 3d_armor
- Updated 3d_armor
 - Neither Ethereal's crystal armor nor technic one are enabled
2015-05-14 11:52:05 +02:00
LeMagnesium
ea1d7b65be Updated snow with fixes 2015-05-11 20:02:54 +02:00
LeMagnesium
6c5c9f6ca9 Dicreased dogfight distance (a bit)
- Dicreased dogfight distance by 0.5 so that players are sure to be able to
   punch *every* monsters while they are attacking them
2015-05-09 12:19:36 +02:00
LeMagnesium
549bd28fd6 Fixed minotaur's rotation
- Fixed minotaur's rotation in its b3d file
 - Added blend file for minotaur (if anyone wants to modify it again)
 - Removed the `rotate` line in sarangay.lua
2015-05-09 11:53:42 +02:00
LeMagnesium
14530443db Updated farming from @tenplus1 's redo
- Updated farming (added beans)
2015-05-07 16:30:20 +02:00
Ombridride
5a76f362a0 Disable Minotaur for the moment
We need to tweak the .blender file because of rotating problems (we're waiting the modder answer for sharing the blender file...)
2015-05-06 23:00:55 +02:00
LeMagnesium
e4b44695ea Removed useless obj 2015-05-06 11:14:40 +02:00
LeMagnesium
896d090e84 Used getraw in food mod to remove global variable warns 2015-05-06 11:04:18 +02:00
LeMagnesium
9a717127e3 Fixed wolf.lua to prevent crash 2015-05-05 14:14:43 +02:00
LeMagnesium
4feb6c29ef Added check for access right when using teleport arrow
- Players can't teleport themselves into an area they can't interact in (ie. enter a house
   by throwing an arrow through the door or on the roof)
2015-05-05 14:11:48 +02:00
Quentin BUISSON-DEBON
aeb83ed122 Update mobs mod
- Add Yeti monster (not over), spawn on snow biome, attack with snowball(arrow), equivalent to Mese Monster but in surface
- Add Minotaur monster (not over), move slowly  and attack sowly, but do big damage
- Fix the "colisionbox" and "view range" of the zombie
- Wolf can now be tamed into dog - he has modified skills (3 damages, move more slower, different texture, run and walk more slowly)
- NPC now do 4 damage when tamed (6 damage when neutral/enemy)
2015-05-05 13:37:37 +02:00
LeMagnesium
43063c037d Updated homedecor (with meshes)
- Updated homedecor
 - Used script to get the meshes back
2015-05-03 17:08:51 +02:00
Ombridride
8bf7e44903 Revert coloredwood parts
Fix the coloredwood "woods" no longer appear in inventory issue (thank you Le_Docteur for the reporting)
2015-05-03 13:27:14 +02:00
d460ee3d4c remove u_skins old directory "skins_enleves" 2015-05-02 23:17:03 +02:00
9f49804ea8 rewrite u_skins meta, used wrong update script 2015-05-02 23:14:06 +02:00
79792a5047 update u_skins database 2015-05-02 22:54:00 +02:00
Gael-de-Sailly
3e154e7806 Timeofday IRC command was in the wrong place, replace it in /mods/irc_commands/init.lua 2015-05-02 20:47:52 +02:00
d042026d0d added python script to delete skins removed when updatedb readd
-simply write int number of removed skin in removed_skins.txt (1 by line)
2015-05-02 17:20:40 +02:00
Gael-de-Sailly
d9785c5476 Add time IRC command 2015-05-02 16:42:35 +02:00
LeMagnesium
41a4945ff2 Updated food mod and added its items in hud/hunger.lua
- Updated food mod (now splitted between food, containing the API, and food_basic, containing the items/craft recipes)
 - Added food's items un hud/hunger.lua
2015-05-02 15:13:40 +02:00
LeMagnesium
f99a3251b3 Removed _misc's /rules and used background to interact
- Removed rules.lua, replaced by interact mod
 - Added background.jpg (made for the server) to interact's formspecs
2015-04-29 12:52:44 +02:00
Quentin BUISSON-DEBON
5d155df1af Adapt the yeti code
(And fix the zombie view range and the mese_monster fleshy against players)
2015-04-28 17:31:22 +02:00
Quentin BUISSON-DEBON
de5a7b6100 Merge branch 'master' of https://github.com/Ombridride/minetest-minetestforfun-server 2015-04-28 15:47:10 +02:00
Quentin BUISSON-DEBON
2029fd7428 Prepare the next update of the mobs mod
- Prepared the update of Minotaur (renamed this mob minotaur)
- NPC tamed with 4 diamonds now do 4 damage (before 6)
- Wolf can now be tamed in exchange of 4 "raw_meat" and become dog, the dog can be healed with "raw_meat" (need to be change, maybe conflicted)
- The dog mob is less powerful than the wolf (-2 damage, less walk/run velocity) => the explanation for this "nerf" is simple, the dog is almost free, compared to the NPC who costs 4 diamonds ! :)
- Add one sound when wolfs attack
- One small fix for the zombie monster
- Add a pre-alpha version of yeti, many things missing for the moment (yeti is a monster who spawns in snow biome and attack wit snowball)
2015-04-28 15:45:35 +02:00
LeMagnesium
ae8e6fc32c Fixed logic blocks' indentation and ending
- Fixed the 'end' crash in api.lua (after last merge)
2015-04-28 10:40:11 +02:00
Ombridride
b368f3250e Update ghoat.lua 2015-04-28 00:19:59 +02:00
Ombridride
95827d8386 Add ghoat (forget add files in the latest commit) 2015-04-28 00:16:16 +02:00
Ombridride
007fa5d7c8 Add Ghoat and update warthog/pumba
- The Ghoat animal is passive, he eats flowers on his way, drop raw_meat if you kill it. But be carful, if you attack him, he will hit you back ! (like cow/warthog and other passive monster who can defend himself)
- Warthogs now spawn on default:dirt and default:junglegrass, this change is made because we move progressively the warthog in jungle
2015-04-28 00:11:08 +02:00
Ombridride
74d84c2c13 Remove Stonemonster from the Nether Forest 2015-04-27 23:19:49 +02:00
Ombridride
36d5704e98 Add zombie monsters, spawn in the Nether Forest
- They are very similar to the Dirt Monster, but they are more slower, has more heath, and less armor, they do the same amount of damage and give the same samount of coins
- Remove the Stonemonster in the Nether Forest, remplaced by Zombies
2015-04-27 23:15:46 +02:00
Ombridride
720b7629c5 Update API.lua of mobs mod 2015-04-27 22:38:49 +02:00
LeMagnesium
e64657f2e1 Merge branch 'eventobjects_add' 2015-04-27 15:29:34 +02:00
LeMagnesium
64ccc2c73d Updated moreblocks 2015-04-26 23:44:56 +02:00
LeMagnesium
ef530f7bb5 Added missing objs
- The other_things' script is very useful in fact
2015-04-26 13:11:14 +02:00
LeMagnesium
ad61a2fd72 Updated homedecor
- Added kingsize beds
2015-04-26 12:14:52 +02:00
LeMagnesium
7932cf13fd Updated 3d_armor
- Updated models
 - Updated armor.lua : new skin mod supported, and new method to drop the armor
2015-04-26 12:05:41 +02:00
LeMagnesium
681c2af852 Added sarangay's rotation
- Used rotate parameter in sarangay's definition
2015-04-25 23:28:56 +02:00
LeMagnesium
0dfb7ee02f Added medias for sarangay
- Added mesh (broken)
 - Added texture
2015-04-25 15:47:07 +02:00
LeMagnesium
c8a8ac6813 Added beginning of sarangay mob's file
- Added sarangay.lua (need mesh file, and configuration)
 - Fixed identation in api.lua
2015-04-25 15:45:47 +02:00
LeMagnesium
73ef7f0f38 Updated README.md 2015-04-23 18:08:18 +02:00
LeMagnesium
9e3dbe86e8 Added animated texture for '?' nodes
- Added eventobjects_surprise_node_animated.jpg by @Ataron
 - Added eventobjects_surprise_node_top.jpg
 - Added animation code into init.lua
2015-04-23 18:08:18 +02:00
LeMagnesium
e0febced46 Changed random selecting to simple 'all dropped' behavior
- '?' nodes now drop eveything they have
2015-04-23 18:08:17 +02:00
LeMagnesium
c668e9f1d8 Added basic code of '?' block 2015-04-23 18:08:17 +02:00
LeMagnesium
bcd1171404 Added '?' block texture 2015-04-23 18:08:17 +02:00
Ataron
c92f1facb2 Add EventObjects 2015-04-23 18:08:17 +02:00
LeMagnesium
a550e170bf Added basic files for new mod 2015-04-23 18:08:17 +02:00
LeMagnesium
356d5eda33 Added interact mod and disabled news if player has not interact
- Added interact mod, with reworked quiz
 - Disabled news' formspec if player has not interact to prevent it from
   swipping away interact's formspecs
2015-04-23 15:03:08 +02:00
LeMagnesium
7457bc8092 Removed u_skins logs 2015-04-23 13:59:18 +02:00
LeMagnesium
387b145162 Maze only creatable by admin 2015-04-22 22:49:28 +02:00
LeMagnesium
0ca2ea9d0d Added official Cyberpangolin skin
- Added officiel Cyberpangolin skin
 - Modified old Cyberpangolin to rename it "Matrix"
 - Added Cyberpangolin and Obani as authors
 - Added a log indicating which skin is registered when and with which name
2015-04-22 21:07:48 +02:00
LeMagnesium
090d1689e3 Got back nether:apple hunger code
- nether:apple increase hunger from 9 points
2015-04-22 19:44:46 +02:00
LeMagnesium
c9399edb70 Added first version of @HybridDog 's maze mod 2015-04-22 18:14:52 +02:00
LeMagnesium
10428fbcfb Removed falling protection inhibiting the engine
- All nodes inhibited now produce logs and are compatible with other mods
2015-04-22 18:09:34 +02:00
LeMagnesium
eafe217291 Added security in invtweak in case node breakers dig nodes 2015-04-21 23:31:24 +02:00
LeMagnesium
363f42b07d Added invtweak, tweaked some returns to avoid strange behavior
- Updated news.txt
 - Added invtweak mod instead of old intweak
 - Updated world.mt
 - Tweaked builtin_falling and creative/init.lua to avoir strange behavior from
   the builtin when parsing on_placenode callbacks in creative mode
2015-04-21 22:23:43 +02:00
LeMagnesium
94c1d3cefa Merged missing parts of mobs' api, updated news
- Updated news.txt
 - Merged missing pieces of api.lua
 - Added a random message
2015-04-21 12:32:35 +02:00
LeMagnesium
5d5bf2dbd7 Reported modification of kamikaze group to creepers 2015-04-21 12:05:53 +02:00
LeMagnesium
8b8fdfa131 Completed proper merge of mobs mod
- Merged api :
	- little tweaks on yaw computing system and position handling when blasting
	- Centralisation of the explosion function used by both dungeon masters and
	  creepers : checks are made differently but still present in the function
- Merged dungeon masters
- Changed type of creepers from kamikaze to explode
- Tweaked a bit rebase script
2015-04-21 11:54:43 +02:00
Ombridride
deeaa98c16 Resolve problems 2015-04-20 23:12:05 +02:00
LeMagnesium
f3da5b0a97 Rolled back mobs mod 2015-04-20 23:07:51 +02:00
Ombridride
e253799535 Add *.so files for IRC mod 2015-04-20 23:02:46 +02:00
LeMagnesium
7865c89e12 Updated dungeonmasters.lua 2015-04-20 22:40:09 +02:00
LeMagnesium
a0454b3b88 Updated api.lua of mobs mod 2015-04-20 22:37:53 +02:00
LeMagnesium
58c6d48d9c Updated connected_chests 2015-04-20 21:38:10 +02:00
LeMagnesium
aa640fb417 Fixed sponges' infinite placement bug 2015-04-20 20:40:16 +02:00
LeMagnesium
f89c6de1af Added support for trapdoor_cherry in mesecons
- Added support in mesecons_doors for doors:trapdoor_cherry
2015-04-20 18:13:54 +02:00
LeMagnesium
4bedca35b1 Removed old mesecons_compatibility and activated mesecons_doors
- Removed backup of mesecons_compatibility
- Activated mesecons_doors instead of mesecons_compatibility in world.mt
2015-04-20 17:18:15 +02:00
ce5605e836 merge 3 commit
Commits on Apr 18, 2015
    Round home positions
    Remove unneeded and slow get_desc function
Commits on Mar 12, 2015
    Add item_names support for Better "HUD"
2015-04-19 23:21:20 +02:00
LeMagnesium
5d5f871c63 Fixed accent gsub 2015-04-19 22:24:39 +02:00
Ombridride
c3f271abd4 Update greenslimes.lua
Less coins chance, but more rare coins (silver)
2015-04-18 23:52:47 +02:00
Ombridride
faeac3128d Update treemonster.lua
Drops adjustments
2015-04-18 23:51:28 +02:00
Ombridride
8558bb0c36 Update lavaslimes.lua
Less coins, but better (silver)
2015-04-18 23:50:37 +02:00
Ombridride
f0f76c5641 Update treemonster.lua
Less silver coins
2015-04-18 23:49:35 +02:00
Ombridride
16b695cf8e Update greenslimes.lua
Only small greenslimes drop coins & glue now
2015-04-18 23:45:44 +02:00
Ombridride
892d2e4b6c Update mummy.lua
Don't jump anymore, useless, and now they can't exit the pyramids
2015-04-18 23:34:00 +02:00
Ombridride
814d9e81a1 Lesser Sand Monster (~ -6,5%) 2015-04-18 23:32:57 +02:00
Ombridride
b84ef6501e Update mummy.lua
More walk/run speed, more lava/light damage
2015-04-18 23:29:56 +02:00
Ombridride
657e01aa57 Update npc.lua
PS : la fonction nourrir sur les NPCs ne fonctionne toujours pas sur le serveur avec la version mergée actuelle
2015-04-18 23:11:19 +02:00
Ombridride
f18c334ea8 Add my current work on colors.txt
It's a hug merge, if somebody wants help, you're welcome ! :p
Instructions are in the folder
2015-04-18 19:24:19 +02:00
11e6bccb32 add substitute chars "éèà"(no displayed) to "eea" 2015-04-18 17:59:40 +02:00
LeMagnesium
2cb0ad809f Updated IRC mod 2015-04-18 17:27:45 +02:00
LeMagnesium
062d83e6d9 Updated homedecor and removed old lavalamp
- Updated homedecor
- Updated news.txt for next merge
- Added script folder in other_things
2015-04-18 15:39:20 +02:00
LeMagnesium
b773b7b4f4 Updated metatools
- Added itemstack handler (write,read,erase)
2015-04-18 13:48:55 +02:00
LeMagnesium
0065e18ca9 Added connected_chests mod
- Added connected_chest mods by @HybridDog
- Changed textures using our lock/chest textures
2015-04-17 22:42:17 +02:00
LeMagnesium
db8cc41fd7 Added check for lavaslime to not destroy actual nodes with fire
- Lavaslimes now check if the node there are trying to place fire instead of
  is air. If it is not, they do not put fire (to avoid detroying nodes)
2015-04-17 22:41:04 +02:00
LeMagnesium
45f0af6215 Allow all architectures to use luaIRC 2015-04-16 20:04:27 +02:00
LeMagnesium
6705bf008f Upgraded hybrid mesecons
- Upgraded mesecons mod while adding old mesecons_compatibility to provide
  doors' redefinition.

NOTE: Every change in the doors' definition must now be recopied here!
2015-04-16 18:25:01 +02:00
LeMagnesium
3e5986999a Added tetrisarcade mod
- Added tetris arcade and created a craft recipe
2015-04-15 18:10:10 +02:00
Obani
bb0aef5151 I added the music Interlude to ambience_modpack (It was compressed) and added it into the init.lua config and into the soundlicenses.txt informations 2015-04-15 15:48:22 +02:00
Ombridride
aadd948525 Small mistake 2015-04-14 22:17:42 +02:00
LeMagnesium
592665d264 Copied lava orbs' definition to lavaslimes' file
- Copied register and alias for lava orbs
2015-04-14 22:08:36 +02:00
Ombridride
ad245f9a47 Organize the code and change the craft recipe...
... of the "sponge:sponge" (Sponge Dry), now the craft need two Yellow Dyes in the craft grid
2015-04-14 22:00:43 +02:00
Ombridride
8b4c623ead Merge pull request #42 from davedevils/patch-10
Wet sponge to Dry Sponge, if you cookde it in a furnace
2015-04-14 21:56:22 +02:00
Gael-de-Sailly
3503838690 Fixed vector.interpolate bug 2015-04-14 21:23:45 +02:00
LeMagnesium
67c3a33fd4 Fixed missing textures' bug
- Changed old mesecons' doors' definitions to use new textures' name
- Removed copied textures
2015-04-14 19:41:05 +02:00
Dave Devil's
d13af67d05 Wet sponge to Dry Sponge
Back the sponge to the normal state ! (with cooking :) )
2015-04-14 01:59:22 +02:00
LeMagnesium
768de17e69 Added missing textures in hud mod after reset 2015-04-13 22:41:21 +02:00
LeMagnesium
bc7309b977 Fixed little things for hunger reset (and a global variable local-ished) 2015-04-13 22:26:49 +02:00
LeMagnesium
56e5d7a9e6 Reset mesecons to 8 Dec 2015-04-13 21:47:57 +02:00
LeMagnesium
dd40c6828e Reset HUD (not ready for server yet) 2015-04-13 21:37:48 +02:00
LeMagnesium
83b50783c6 Added NPC's counter adapted to the API
- It seems in fact that sometimes, when you give the fourth diamond to a NPC, it does not follow
  because you're too close to it. (engine's entity issue, or algorythm issue, but not really one
  since you just have to move in 99% of the cases to make the NPC follow you)
2015-04-13 21:25:04 +02:00
LeMagnesium
544c7ef55b Reverted NPC taming 2015-04-12 23:36:50 +02:00
LeMagnesium
5568cc4cff Fixed NPC counter 2015-04-12 23:24:01 +02:00
LeMagnesium
d6bea75353 Merge branch 'master' of gitpiserver:minetest/minetest-minetestforfun-server
Conflicts:
	mods/mobs/npc.lua
2015-04-12 23:18:33 +02:00
LeMagnesium
814f48c15b Re-added npc taming system (for 4 diamonds) 2015-04-12 23:13:51 +02:00
LeMagnesium
2df3b7828c Re-added npc taming system (for 4 diamonds) 2015-04-12 23:04:48 +02:00