Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev
2025-09-09 18:15:33 +02:00 · 2021-07-16 23:40:29 +02:00 · 2020-07-17 22:49:18 +02:00 · 2020-06-16 22:33:04 +02:00 · 2020-02-16 18:04:10 +01:00 · 2019-12-22 13:28:33 +01:00
2 changed files with 2 additions and 2 deletions
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +0,0 @@
 Wuzzy <Wuzzy@disroot.org> <Wuzzy2@mail.ru>
 Wuzzy <Wuzzy@disroot.org> <almikes@aol.com>
--- a/init.lua
+++ b/init.lua
@@ -566,3 +566,5 @@ minetest.register_globalstep(function(dtime)
 	end
 	if timer > 4 then timer = 0 end
 end)
 minetest.log("action", "[hudbars] loaded.")
Author	SHA1	Message	Date
sys4	a7d0774ad0	Merge remote-tracking branch 'upstream/master'	2021-07-16 23:40:29 +02:00
sys4	26a36dde55	Merge remote-tracking branch 'upstream/master'	2020-07-17 22:49:18 +02:00
sys4	28dcf8af65	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-06-16 22:33:04 +02:00
sys4	c4ddef312e	Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev	2020-02-16 18:04:10 +01:00
sys4	7f6ed309b3	Merge branch 'master' of yunohost.local:mtcontrib/minetest_hudbars into nalc-1.2-dev	2019-12-22 13:28:33 +01:00
sys4	7cd5940c68	Merge branch 'master' into nalc-1.2	2019-05-09 22:15:22 +02:00
sys4-fr	67ca481f7c	Ajoute message de chargement du mod dans le journal "action"	2018-12-25 17:43:52 +01:00
		`@@ -1,2 +0,0 @@`
			`Wuzzy <Wuzzy@disroot.org> <Wuzzy2@mail.ru>`
			`Wuzzy <Wuzzy@disroot.org> <almikes@aol.com>`