From da7dfb1ea407c8487dde80ed4387ddf4dc1d754c Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sat, 30 Jan 2021 19:51:55 +0100 Subject: [PATCH] Update README and CONTRIBUTING to the new maintainership situation --- CONTRIBUTING.md | 34 +++++++++++++++++----------------- README.md | 8 +++++--- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index faa7cd75a3..ab2f594125 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,45 +7,45 @@ But first, some things to note: MineClone 2's development target is to make a free software clone of Minecraft, ***version 1.11***, ***PC edition***. -MineClone 2 is maintained by one person. Namely, Wuzzy. You can find me, -Wuzzy, in the Minetest forums (forums.minetest.net), in IRC in the #minetest +MineClone 2 is maintained by two persons. Namely, kay27 and EliasFleckenstein. You can find us +in the Minetest forums (forums.minetest.net), in IRC in the #minetest channel on irc.freenode.net. And finally, you can send e-mails to -. + or . -There is **no** guarantee I will accept anything from anybody. +There is **no** guarantee we will accept anything from anybody. -By sending me patches or asking me to include your changes in this game, +By sending us patches or asking us to include your changes in this game, you agree that they fall under the terms of the LGPLv2.1, which basically means they will become part of a free software. ## The suggested workflow -I don't **dictate** your workflow, but in order to work with me in an efficient -way, you can follow my suggestions. +We don't **dictate** your workflow, but in order to work with us in an efficient +way, you can follow these suggestions: For small and medium changes: * Fork the repository * Do your change in a new branch * Upload the repository somewhere where it can be accessed from the Internet and - notify me + notify us -For small changes, sending me a patch is also good. +For small changes, sending us a patch is also good. -For big changes: Same as above, but consider notifying me first to avoid +For big changes: Same as above, but consider notifying us first to avoid duplicate work and possible tears of rejection. ;-) -For people that I trust, I might give them direct commit access to this +For trusted people, we might give them direct commit access to this repository. In this case, you obviously don't need to fork, but you still -need to show your contributions align with the project goals. I still -reserve the right to revert everything that I don't like. -For bigger changes, I strongly recommend to use feature branches and +need to show your contributions align with the project goals. We still +reserve the right to revert everything that we don't like. +For bigger changes, we strongly recommend to use feature branches and discuss with me first. Contributors will be credited in `README.md`. ## Quality remarks -Again: There is ***no*** guarantee I will accept anything from anybody. -But I will gladly take in code from others when I feel it saves me work +Again: There is ***no*** guarantee we will accept anything from anybody. +But we will gladly take in code from others when we feel it saves us work in the long run. ### Inclusion criteria @@ -79,7 +79,7 @@ Depending on what you add, the chances for inclusion vary: ## Reporting bugs Report all bugs and missing Minecraft features here: - + ## Direct discussion We have an IRC channel! Join us on #mineclone2 in freenode.net. diff --git a/README.md b/README.md index bf0dfb566c..1ee926263b 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ Technical differences from Minecraft: ## Reporting bugs Please report all bugs and missing Minecraft features here: - + ## Other readme files @@ -203,7 +203,8 @@ There are so many people to list (sorry). Check out the respective mod directori * [ryvnf](https://github.com/ryvnf): Explosion mechanics * MysticTempest: Bugfixes * [bzoss](https://github.com/bzoss): Status effects, potions, brewing stand -* kay27 : Experience system, bugfixes, optimizations +* kay27 : Experience system, bugfixes, optimizations (Current maintainer) +* [EliasFleckenstein03](https://github.com/EliasFleckenstein03): End crystals, enchanting, burning mobs / players, animated chests, bugfixes (Current maintainer) * 2mac: Fix bug with powered rail * Lots of other people: TO BE WRITTEN (see mod directories for details) @@ -250,6 +251,7 @@ Various sources. See the respective mod directories for details. ### Special thanks * davedevils for starting MineClone, the original version of this game +* Wuzzy for starting and maintaining MineClone2 for several years * celeron55 for creating Minetest * Minetest's modding community for providing a huge selection of mods, some of which ended up in MineClone 2 * Jordach for the jukebox music compilation from Big Freaking Dig @@ -269,7 +271,7 @@ Copying is an act of love. Please copy and share! <3 Here's the detailed legalese for those who need it: ### License of source code -MineClone 2 (by Wuzzy, davedevils and countless others) +MineClone 2 (by kay27, EliasFleckenstein, Wuzzy, davedevils and countless others) is an imitation of Minecraft. MineClone 2 is free software: you can redistribute it and/or modify