Merge branch 'stable-1.0' into stable-1.1

2019-12-22 11:52:00 +01:00 · 2019-12-07 18:37:45 +01:00 · 2019-12-07 14:16:49 +01:00 · 2019-12-07 13:52:52 +01:00 · 2019-12-07 13:17:24 +01:00 · 2019-12-06 22:16:26 +01:00
15 changed files with 13 additions and 17 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -169,9 +169,6 @@
 [submodule "metatools"]
 	path = metatools
 	url = https://sys4.fr/gitea/nalc/minetest-mod-metatools.git
-[submodule "minercantile"]
-	path = minercantile
-	url = https://sys4.fr/gitea/nalc/minercantile.git
 [submodule "mob_horse"]
 	path = mob_horse
 	url = https://sys4.fr/gitea/nalc/mob_horse.git
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
sys4	678bcbb65f	Merge branch 'stable-1.0' into stable-1.1	2019-12-22 11:52:00 +01:00
sys4	95a0305323	Merge branch 'stable-1.0' into stable-1.1	2019-12-07 18:37:45 +01:00
sys4	dfadc6e648	Merge branch 'stable-1.0' into stable-1.1	2019-12-07 14:16:49 +01:00
sys4	ea4d1f3510	Merge branch 'stable-1.0' into stable-1.1	2019-12-07 13:52:52 +01:00
sys4	5f3c260f48	Merge branch 'stable-1.0' into stable-1.1	2019-12-07 13:17:24 +01:00
sys4	6a1f5f9acd	Merge branch 'stable-1.0' into stable-1.1	2019-12-06 22:16:26 +01:00
sys4	0f588976b7	Merge branch 'stable-1.0' into stable-1.1	2019-12-06 21:53:50 +01:00
sys4	4e7cd4d2c5	Merge branch 'stable-1.0' into stable-1.1	2019-12-06 19:56:24 +01:00
sys4	9abea0e8e3	Merge branch 'stable-1.0' into stable-1.1	2019-12-06 19:35:25 +01:00
sys4	640342035b	Merge branch 'stable-1.0' into stable-1.1	2019-12-06 19:23:25 +01:00
sys4	8c403f7124	Merge branch 'stable-1.0' into stable-1.1	2019-12-06 19:02:19 +01:00
sys4	73688eff84	Merge branch 'stable-1.0' into stable-1.1	2019-12-06 18:55:13 +01:00
sys4	f8e7c9de44	Merge branch 'stable-1.0' into stable-1.1	2019-12-06 18:27:39 +01:00
sys4	d321b60cd1	Merge branch 'stable-1.0' into stable-1.1	2019-12-01 22:27:32 +01:00
sys4	47f7f05112	Merge branch 'stable-1.0' into stable-1.1	2019-12-01 17:07:54 +01:00
sys4	e2e8219f9b	Merge branch 'stable-1.0' into stable-1.1	2019-12-01 16:15:19 +01:00
sys4	68b9136232	Merge branch 'stable-1.0' into stable-1.1	2019-12-01 15:32:37 +01:00
sys4	350f06dec7	Merge branch 'stable-1.0' into stable-1.1	2019-11-25 01:02:35 +01:00
sys4	cb839b895d	Merge branch 'stable-1.0' into stable-1.1	2019-11-17 23:28:18 +01:00
sys4	4d34ce0ce8	Merge branch 'stable-1.0' into stable-1.1	2019-11-17 22:51:37 +01:00
sys4	d7c6b81273	Merge branch 'stable-1.0' into stable-1.1	2019-11-17 20:47:00 +01:00
sys4	591e9423b2	Merge branch 'stable-1.0' into stable-1.1	2019-11-08 23:10:35 +01:00
sys4	46cc6b9ad3	Merge branch 'stable-1.0' into stable-1.1	2019-11-03 13:13:13 +01:00
sys4	46befcada7	Merge branch 'stable-1.0' into stable-1.1	2019-11-03 12:50:05 +01:00
sys4	8a432103f2	Merge branch 'stable-1.0' into stable-1.1	2019-11-03 12:40:50 +01:00
sys4	28cdbfd765	Merge branch 'stable-1.0' into stable-1.1	2019-11-03 12:20:26 +01:00
sys4	c354035b97	Merge branch 'stable-1.0' into stable-1.1	2019-11-03 11:46:14 +01:00
sys4	e740f02aa5	Merge branch 'stable-1.0' into stable-1.1	2019-11-03 11:25:27 +01:00
sys4	02ef7582c8	Merge branch 'stable-1.0' into stable-1.1	2019-11-03 10:46:54 +01:00
sys4	438f3fa1db	Merge branch 'stable-1.0' into stable-1.1	2019-11-03 08:58:06 +01:00
sys4	343f9e2109	Merge branch 'stable-1.0' into stable-1.1	2019-11-02 17:44:16 +01:00
sys4	c353db79df	Merge branch 'stable-1.0' into stable-1.1	2019-11-02 16:45:48 +01:00
sys4	1600976dde	Merge branch 'stable-1.0' into stable-1.1	2019-11-02 16:26:52 +01:00
sys4	d6ab66485f	Merge branch 'stable-1.0' into stable-1.1	2019-11-02 15:20:15 +01:00
sys4	c0b76d902b	Merge branch 'stable-1.0' into stable-1.1	2019-10-12 15:22:15 +02:00
sys4	18a9fb0279	Merge branch 'stable-1.0' into stable-1.1	2019-10-11 20:21:41 +02:00
sys4-fr	b7f882c9a2	Merge branch 'stable-1.0' into stable-1.1	2019-09-29 15:43:33 +02:00
sys4	d2a9d200eb	Merge branch 'stable-1.0' into stable-1.1	2019-09-29 10:59:56 +02:00
sys4	456684653b	Merge branch 'stable-1.0' into stable-1.1	2019-09-29 10:37:02 +02:00
sys4	871f58c92d	Merge branch 'stable-1.0' into stable-1.1	2019-09-29 00:34:56 +02:00
sys4	6599ffda6c	Merge branch 'stable-1.0' into stable-1.1	2019-09-28 23:28:54 +02:00
sys4	3d1a0f9c8e	Merge branch 'stable-1.0' into stable-1.1	2019-09-09 15:18:26 +02:00
sys4	de38e3fa96	Merge branch 'stable-1.0' into stable-1.1	2019-09-09 14:34:07 +02:00
sys4	affab9ec31	Merge branch 'stable-1.0' into stable-1.1	2019-09-06 19:37:45 +02:00
sys4	b6a13f1210	[sea] Change url submodule	2019-09-06 19:17:42 +02:00
sys4	e1fd716891	(#42 ) [seaglass] Corrige compatibilité Minetest 5	2019-08-15 19:14:34 +02:00
sys4	27bb8c3759	Merge branch 'stable-1.0' into stable-1.1	2019-08-13 20:41:38 +02:00
sys4	ec0d68aede	Merge branch 'stable-1.0' into stable-1.1	2019-07-22 20:26:03 +02:00
sys4	e6cca58881	Merge branch 'stable-1.0' into stable-1.1	2019-06-09 14:24:32 +02:00
sys4	2f4b562506	Merge branch 'stable-1.0' into stable-1.1	2019-06-09 13:10:51 +02:00
sys4	9cf1dea367	Merge branch 'stable-1.0' into stable-1.1	2019-06-09 12:39:06 +02:00
sys4	5cce0b5e12	Merge branch 'stable-1.0' into stable-1.1	2019-06-02 17:18:44 +02:00
sys4	29fa3c929d	Merge branch 'stable-1.0' into stable-1.1	2019-06-02 16:51:50 +02:00
sys4	ea26fd8526	Merge branch 'stable-1.0' into stable-1.1	2019-06-02 15:30:30 +02:00
sys4	0a69610267	Merge branch 'stable-1.0' into stable-1.1	2019-06-02 14:20:21 +02:00
sys4	540616d055	Merge branch 'stable-1.0' into stable-1.1	2019-06-02 12:34:06 +02:00
sys4	7a81b3b561	Merge branch 'stable-1.0' into stable-1.1	2019-05-26 20:17:15 +02:00
sys4	4dcad6547b	Merge branch 'stable-1.0' into stable-1.1	2019-05-25 15:18:13 +02:00
sys4	02912e4e52	Merge branch 'stable-1.0' into stable-1.1	2019-05-25 15:00:10 +02:00
sys4	7f05cdbb02	Merge branch 'stable-1.0' into stable-1.1	2019-05-25 14:20:28 +02:00
sys4	c6427bb1af	Merge branch 'stable-1.0' into stable-1.1	2019-05-25 13:27:10 +02:00
sys4	dbe82dfc6a	Merge branch 'stable-1.0' into stable-1.1	2019-05-16 21:20:44 +02:00
sys4	e8a5e6b63e	Merge branch 'stable-1.0' into stable-1.1	2019-05-13 20:09:29 +02:00
sys4	3e9024355c	Merge branch 'stable-1.0' into stable-1.1	2019-05-13 19:27:57 +02:00
sys4	cc681e6703	Merge branch 'stable-1.0' into stable-1.1	2019-05-12 21:27:20 +02:00
sys4	dfacb17f66	Merge branch 'stable-1.0' into stable-1.1	2019-05-12 20:36:18 +02:00
sys4	cc179d6432	Merge branch 'stable-1.0' into stable-1.1	2019-05-12 19:57:33 +02:00
sys4	201749fb13	Merge branch 'stable-1.0' into stable-1.1	2019-05-11 22:51:08 +02:00
sys4	6f7e6ce160	(#40 ) Corrige crash avec la scie circulaire - Bien qu'ayant le même nom, certains blocs pouvant être recyclés dans la scie circulaire faisaient crascher le serveur. Cela se produisait avec les blocs (stairs, slabs) fabriqués avant la mise à jour vers Minetest 5.	2019-05-05 22:57:42 +02:00
sys4	f9ff783c4d	[serverguide] Ajoute description de la commande /hotbar	2019-05-02 00:20:44 +02:00
sys4	247e8e1ab1	(#34 ) [serverguide][interact] Textes modifiés et ajout règle - [interact] Ajout d'une règle - [serverguide] Modifie les textes	2019-05-01 21:19:04 +02:00
sys4	e06adae334	(#38 ) Corrige emplacement de la barre de vie/respiration - La barre se situe à nouveau au dessus de la tête du joueur.	2019-05-01 18:49:44 +02:00
sys4	3bb4c26c72	(#36 ) [unified_inventory] Supprime icônes set_home et home_go - Ces icônes sont redondantes avec l'icône h2omes	2019-05-01 17:31:53 +02:00
sys4	e9c6e276c2	(#35 ) Suppression du mod minercantile	2019-05-01 12:23:55 +02:00
sys4	f2d3d1cc3f	[locks] Mise à jour et correction texture porte vérouillé. * Mise à jour depuis le dépôt d'origine * Correction de la texture quand une porte vérouillé est dans la main du joueur.	2019-04-26 23:39:46 +02:00
sys4	a4a0b23b71	[nalc][nalc_doors] Corrige crash quand on dig une porte de 3 blocs.	2019-04-26 23:08:45 +02:00
sys4	ac20c8c996	[plantlife_modpack][trunks] #24 : Moss et moss_fungus se droppent. * Ajout de ces deux items dans le groupe attached_node. Cela évite d'avoir de la mousse qui reste accrochée dans le vide.	2019-04-26 20:04:59 +02:00
sys4	ada440b9c0	[moretrees] #19 : Drop des arbres de jungle de moretrees en default. * La récolte des arbres de jungle générés par moretrees donne ceux du mod default. Cela évite d'avoir l'impression de doublons dans l'inventaire et on y gagne un peu plus de place.	2019-04-26 19:15:00 +02:00
sys4	3020501c64	[diet][food_sweet] Actualise le support de la nourriture. * diet et food_sweet supportent les blueberries de Minetest 5 (#17) * diet mis à jour pour la nourriture de farming	2019-04-21 00:45:06 +02:00
sys4	2a9939ad86	Ticket #15 : Optimisation du mod sea pour Minetest 5	2019-04-20 20:35:27 +02:00
sys4	1c89ab5429	Ticket #14 : Texture auiguilles de pain remplacée par Minetest 5	2019-04-20 13:12:23 +02:00
sys4	0e677623ed	Ticket #26 : Correction du mod plantlife_modpack * Cette correction ne fait plus crasher le mod awards lors de la récolte de fougères arborescentes.	2019-04-12 20:05:05 +02:00
sys4	1a2215086c	[plantlife_modpack] Mise à jour du mod depuis le dépôt d'origine	2019-04-12 19:01:28 +02:00
sys4	db8cf9b409	[name_restrictions] MAJ appels déprécié minetest.settings:get	2019-04-08 01:30:25 +02:00
sys4	105b4c2ad3	Ticket #13 : [name_restrictions] Correction crash au démarrage	2019-04-08 00:36:57 +02:00