diff --git a/builtin/mainmenu/credits.json b/builtin/mainmenu/credits.json index 8a946893cedb7..cd2b15d78d7ed 100644 --- a/builtin/mainmenu/credits.json +++ b/builtin/mainmenu/credits.json @@ -1,5 +1,5 @@ { - "#": "https://github.com/orgs/minetest/teams/engine/members", + "#": "https://github.com/orgs/luanti-org/teams/engine/members", "core_developers": [ "Perttu Ahola (celeron55) [Project founder]", "sfan5 ", @@ -15,7 +15,8 @@ "Gregor Parzefall (grorp)", "Lars Müller (luatic)", "cx384", - "sfence" + "sfence", + "y5nw" ], "previous_core_developers": [ "BlockMen", @@ -38,7 +39,7 @@ "Hugues Ross ", "Dmitry Kostenko (x2048) " ], - "#": "Currently only https://github.com/orgs/minetest/teams/triagers/members", + "#": "Currently only https://github.com/orgs/luanti-org/teams/triagers/members", "core_team": [ "Zughy [Issue triager]", "wsor [Issue triager]", @@ -47,23 +48,20 @@ "#": "For updating active/previous contributors, see the script in ./util/gather_git_credits.py", "contributors": [ "JosiahWI", - "1F616EMO", - "y5nw", "Erich Schubert", - "numzero", + "wrrrzr", + "1F616EMO", "red-001 ", - "David Heidelberg", - "Wuzzy", + "veprogames", "paradust7", - "HybridDog", - "Zemtzov7", - "kromka-chleba", "AFCMS", - "chmodsayshello", - "OgelGames" + "siliconsniffer", + "Wuzzy", + "Zemtzov7", ], "previous_contributors": [ "Ælla Chiana Moskopp (erle) [Logo]", + "numzero", "Giuseppe Bilotta", "ClobberXD", "Dániel Juhász (juhdanad) ", diff --git a/util/gather_git_credits.py b/util/gather_git_credits.py index 513a406cdd59b..b02275644dc04 100755 --- a/util/gather_git_credits.py +++ b/util/gather_git_credits.py @@ -6,7 +6,7 @@ codefiles = r"(\.[ch](pp)?|\.lua|\.md|\.cmake|\.java|\.gradle|Makefile|CMakeLists\.txt)$" # two minor versions back, for "Active Contributors" -REVS_ACTIVE = "5.8.0..HEAD" +REVS_ACTIVE = "5.9.0..HEAD" # all time, for "Previous Contributors" REVS_PREVIOUS = "HEAD" @@ -27,7 +27,7 @@ def load(revs): p2 = subprocess.Popen(["git", "show", "--numstat", "--pretty=format:", hash], stdout=subprocess.PIPE, universal_newlines=True) for line in p2.stdout: - added, deleted, filename = re.split(r"\s+", line.strip(), 2) + added, deleted, filename = re.split(r"\s+", line.strip(), maxsplit=2) if re.search(codefiles, filename) and added != "-": n += int(added) p2.wait()