Merge branch 'master' into bone_meal

CONTRIBUTING.md

@@ -32,6 +32,8 @@ playerbase on low spec computers, optimizations are hard to investigate.
 * [Matrix](https://app.element.io/#/room/#mc2:matrix.org)
 * [Reddit](https://www.reddit.com/r/MineClone2/)
 * [Minetest forums](https://forum.minetest.net/viewtopic.php?f=50&t=16407)
+* [ContentDB](https://content.minetest.net/packages/wuzzy/mineclone2/)
+* [OpenCollective](https://opencollective.com/mineclone2)
 
 ## Using git
 MineClone2 is developed using the version control system
@@ -194,9 +196,16 @@ MeseHub, let us know what you think about a topic and help us make
 decisions. Also, note that a lot of discussion takes place on the
 Discord server, so it's definitely worth checking it out.
 
+### Funding
+You can help pay for our infrastructure (Mesehub) by donating to our
+OpenCollective link (See Links section).
+
 ### Crediting
 If you opened or have contributed to an issue, you receive the
 `Community` role on our Discord (after asking for it).
+OpenCollective Funders are credited in their own section in
+`CREDITS.md` and receive a special role "Funder" on our discord (unless
+they have made their donation Incognito).
 
 ## How you can help as a programmer
 (Almost) all the MineClone2 development is done using pull requests.

CREDITS.md

@@ -130,6 +130,9 @@
 * todoporlalibertad
 * Marcin Serwin
 
+## Funders
+* 40W
+
 ## Special thanks
 * celeron55 for creating Minetest
 * Jordach for the jukebox music compilation from Big Freaking Dig

README.md

@@ -85,6 +85,8 @@ The MineClone2 repository is hosted at Mesehub. To contribute or report issues,
 * Matrix: <https://app.element.io/#/room/#mc2:matrix.org>
 * Reddit: <https://www.reddit.com/r/MineClone2/>
 * Minetest forums: <https://forum.minetest.net/viewtopic.php?f=50&t=16407>
+* ContentDB: <https://content.minetest.net/packages/wuzzy/mineclone2/>
+* OpenCollective: <https://opencollective.com/mineclone2>
 
 ## Target
 - Crucially, create a stable, moddable, free/libre clone of Minecraft

mods/HUD/mcl_credits/people.lua

@@ -132,6 +132,9 @@ return {
 		"todoporlalibertad",
 		"Marcin Serwin",
 	}},
+	{S("Funders"), 0xF7FF00, {
+		"40W",
+	}},
 	{S("Special thanks"), 0x00E9FF, {
 		"celeron55 for creating Minetest",
 		"Jordach for the jukebox music compilation from Big Freaking Dig",

tools/generate_ingame_credits.lua

@@ -13,6 +13,7 @@ local colors = {
 	["3D Models"] = "0x0019FF",
 	["Textures"] = "0xFF9705",
 	["Translations"] = "0x00FF60",
+	["Funders"] = "0xF7FF00",
 	["Special thanks"] = "0x00E9FF",
 }