Merge remote-tracking branch 'upstream/master'

2025-07-19 16:50:20 +02:00 · 2023-11-22 23:32:31 +01:00 · 2023-06-05 23:46:11 +02:00 · 2022-08-26 14:56:17 +02:00 · 2022-06-25 16:46:39 +02:00 · 2022-05-27 18:30:28 +02:00
1 changed files with 0 additions and 1 deletions
--- a/init.lua
+++ b/init.lua
@ -831,7 +831,6 @@ ddoo("spinach.lua", farming.eggplant)
 ddoo("ginger.lua", farming.ginger)

 dofile(farming.path .. "/food.lua")
-
 if not farming.mcl then
 	dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility
 end
Author	SHA1	Message	Date
sys4	a26e4f94f2	Merge remote-tracking branch 'upstream/master'	2023-11-22 23:32:31 +01:00
sys4	f1d02c7877	Merge remote-tracking branch 'upstream/master'	2023-06-05 23:46:11 +02:00
sys4	31101de345	Merge remote-tracking branch 'upstream/master'	2022-08-26 14:56:17 +02:00
sys4	19d5001f46	Merge remote-tracking branch 'upstream/master'	2022-06-25 16:46:39 +02:00
sys4	7e5db833e0	Merge remote-tracking branch 'upstream/master'	2022-05-27 18:30:28 +02:00
sys4	cfe731352d	Merge remote-tracking branch 'upstream/master'	2022-03-05 11:21:27 +01:00
sys4	22fc0be525	Merge remote-tracking branch 'upstream/master'	2021-12-10 21:36:18 +01:00
sys4	1b0e96cfc7	Merge remote-tracking branch 'upstream/master'	2021-11-26 21:41:25 +01:00
sys4	d087d639b8	Merge remote-tracking branch 'upstream/master'	2021-10-04 21:33:02 +02:00
sys4	23d12c3c8c	Merge remote-tracking branch 'upstream/master'	2021-08-31 19:45:54 +02:00
sys4	942d6eafba	Merge remote-tracking branch 'upstream/master'	2021-07-26 22:13:26 +02:00
sys4	9b6a055534	Merge remote-tracking branch 'upstream/master'	2021-07-24 13:06:40 +02:00
sys4	361e006b56	Merge remote-tracking branch 'upstream/master'	2021-07-17 20:45:17 +02:00
sys4	48951090c0	Merge remote-tracking branch 'upstream/master'	2021-07-16 23:37:53 +02:00
sys4	3246f11594	Merge remote-tracking branch 'upstream/master'	2021-07-05 22:09:01 +02:00
sys4	756b4417ea	Merge remote-tracking branch 'upstream/master'	2021-06-20 17:08:12 +02:00
sys4	787b7b3396	Merge remote-tracking branch 'upstream/master'	2021-05-09 21:36:27 +02:00
sys4	847a9a4527	Merge remote-tracking branch 'upstream/master'	2021-04-17 13:47:05 +02:00
sys4	9fa818c1aa	Merge remote-tracking branch 'upstream/master'	2021-04-04 20:57:42 +02:00
sys4	13df43deeb	Merge remote-tracking branch 'upstream/master'	2021-03-25 21:38:38 +01:00
sys4	e0340ce2cf	Merge remote-tracking branch 'upstream/master'	2021-03-12 12:19:42 +01:00
sys4	8f2c41abe9	Merge remote-tracking branch 'upstream/master'	2021-02-23 21:15:00 +01:00
sys4	59743d747f	Merge remote-tracking branch 'upstream/master'	2021-02-07 13:06:50 +01:00
sys4	c8284b6410	Merge remote-tracking branch 'upstream/master'	2021-01-15 21:09:25 +01:00
sys4	62b83f71a4	Merge remote-tracking branch 'upstream/master'	2021-01-02 14:23:48 +01:00
sys4	11b79dffd2	Merge remote-tracking branch 'upstream/master'	2020-12-15 23:26:24 +01:00
sys4	52575203c4	Merge remote-tracking branch 'upstream/master'	2020-09-04 21:39:24 +02:00
sys4	5c012d470b	Merge remote-tracking branch 'upstream/master'	2020-08-29 20:32:26 +02:00
sys4	a6bc7aaf9e	Merge remote-tracking branch 'upstream/master'	2020-08-25 20:02:52 +02:00
sys4	0cc0a7233f	Merge remote-tracking branch 'upstream/master'	2020-08-22 09:17:06 +02:00
sys4	58f3dbf783	Merge remote-tracking branch 'upstream/master'	2020-08-04 20:46:58 +02:00
sys4	fb733d8f6f	Merge remote-tracking branch 'upstream/master'	2020-07-17 22:51:45 +02:00
sys4	016528f585	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-06-16 21:43:22 +02:00
sys4	88ed7b5a7f	Supprime la génération des carottes et du maïs	2020-06-14 15:42:23 +02:00
sys4	e9d97cfeb1	Merge branch 'master' of yunohost.local:mtcontrib/farming into nalc-1.2-dev	2019-12-22 13:05:51 +01:00
sys4	19577a3917	Merge branch 'master' into nalc-1.2	2019-05-09 21:40:50 +02:00
sys4-fr	ec40c00836	Ajoute message de chargement du mod dans le journal "action"	2018-12-25 15:48:08 +01:00