Merge 7a56282b48 into bf299624dd

Co-authored-by: nodiscc <nodiscc@gmail.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,31 +1,48 @@
-<!-- DO NOT DELETE THE TEXT BELOW if you are adding new software to the list. Please make sure relevant boxes are checked [x] -->
+<!-- DO NOT DELETE THE TEXT BELOW if you are adding new software to the list. -->
 
 Thank you for taking the time to work on a PR for Awesome-Selfhosted!
 
 To ensure your PR is dealt with swiftly please check the following:
 
-- [ ] Submit one item per pull request. This eases reviewing and speeds up inclusion.
+**General**
-- [ ] Format your submission as follows, where `Demo` and `Clients` are optional.
+<!-- All checkboxes here must be checked (replace [ ] with [x]) -->
-  Do not add a duplicate `Source code` link if it is the same as the main link.
+
-  Keep the short description under 250 characters and use [sentence case](https://en.wikipedia.org/wiki/Letter_case#Sentence_case)
+- [ ] Submit one item per pull request.
-  for it, even if the project's webpage or readme uses another capitalisation
-  such as title case, all caps, small caps or all lowercase.
-  `Demo` links should only be used for interactive demos, i.e. not video demonstrations.
-  ``- [Name](http://homepage/) - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
-- [ ] Additions that depend on proprietary services outside the user's control must be marked `⚠`.
-  ``- [Name](http://homepage/) `⚠` - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
-- [ ] Additions that are not [Free software](https://en.wikipedia.org/wiki/Free_software) must be added to `non-free.md` and have the license set to `⊘ Proprietary`
-- [ ] Additions are inserted preserving alphabetical order.
-- [ ] Additions are not already listed at any of [awesome-sysadmin](https://github.com/n1trux/awesome-sysadmin), [staticgen.com](https://www.staticgen.com/), [staticsitegenerators.net](https://staticsitegenerators.net/), [dbdb.io](https://dbdb.io/browse).
-- [ ] The `Language` tag is the main **server-side** requirement for the software. Don't include frameworks or specific dialects.
-- [ ] Any license you add is in our [list of licenses](https://github.com/awesome-selfhosted/awesome-selfhosted/blob/master/README.md#list-of-licenses).
-- [ ] You have searched the repository for any relevant [issues](https://github.com/awesome-selfhosted/awesome-selfhosted/issues) or [PRs](https://github.com/awesome-selfhosted/awesome-selfhosted/pulls), including closed ones.
-- [ ] Any category you are creating has the minimum requirement of 3 items.
-  If not, your addition may be inserted into `Miscellaneous`.
-- [ ] Any software project you are adding to the list is actively maintained.
-- [ ] Any software project you are adding was first released more than 4 months ago.
-- [ ] Any software project you are adding has working installation instructions.
 - [ ] If you are adding software forked from another project, please provide/link to a clear list of differences between both.
+- [ ] You have searched the repository for any relevant [issues](https://github.com/awesome-selfhosted/awesome-selfhosted/issues) or [PRs](https://github.com/awesome-selfhosted/awesome-selfhosted/pulls), including closed ones.
+- [ ] Additions are not already listed at any of [awesome-sysadmin](https://github.com/n1trux/awesome-sysadmin), [staticgen.com](https://www.staticgen.com/), [staticsitegenerators.net](https://staticsitegenerators.net/), [dbdb.io](https://dbdb.io/browse).
 - [ ] The pull request title is informative, unlike "Update README.md".
       Suggested titles: "Add aaa to bbb" for adding software aaa to section bbb,
       "Remove aaa from bbb" for removing, "Fix license for aaa", etc.
+
+**Requirements**
+<!-- All checkboxes here must be checked (replace [ ] with [x]) -->
+
+- [ ] Any software project you are adding to the list is actively maintained.
+- [ ] Any software project you are adding was first released more than 4 months ago.
+- [ ] Any software project you are adding has working installation instructions.
+
+**Formatting and description** 
+<!-- All checkboxes here must be checked (replace [ ] with [x]) -->
+
+- [ ] Additions are inserted preserving alphabetical order.
+- [ ] Format your submission as follows, where `Demo` and `Clients` are optional.
+      ``- [Name](http://homepage/) - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
+  - [ ] Do not add a duplicate `Source code` link if it is the same as the main link.
+  - [ ] Keep the short description under 250 characters and use [sentence case](https://en.wikipedia.org/wiki/Letter_case#Sentence_case) for it, even if the project's webpage or readme uses another capitalisation such as title case, all caps, small caps or all lowercase.
+  - [ ] `Demo` links should only be used for interactive demos, i.e. not video demonstrations.
+- [ ] The `Language` tag is the main **server-side** requirement for the software. Don't include frameworks or specific dialects.
+- [ ] Any license you add is in our [list of licenses](https://github.com/awesome-selfhosted/awesome-selfhosted/blob/master/README.md#list-of-licenses).
+
+**Proprietary & non-free Software**
+<!-- Only check the checkboxes applicable to your software (replace [ ] with [x]) -->
+
+- [ ] Additions that depend on proprietary services outside the user's control must be marked `⚠`.
+ ``- [Name](http://homepage/) `⚠` - Short description, under 250 characters, sentence case. ([Demo](http://url.to/demo), [Source Code](http://url.of/source/code), [Clients](https://url.to/list/of/related/clients-or-apps)) `License` `Language` ``
+- [ ] Additions that are not [Free software](https://en.wikipedia.org/wiki/Free_software) must be added to `non-free.md` and have the license set to `⊘ Proprietary`
+
+**Other**
+<!-- Only check the checkboxes applicable to your software (replace [ ] with [x]) -->
+
+- [ ] Any category you create has the minimum requirement of 3 items.
+      If not, your addition may be inserted into `Miscellaneous`.

README.md

@@ -1048,6 +1048,7 @@ Multiplayer game servers and [browser games](https://en.wikipedia.org/wiki/Brows
 Utilities for managing game servers.
 
 - [ARRCON](https://github.com/radj307/ARRCON) - Terminal-based RCON client compatible with any game servers using the Source RCON Protocol. `GPL-3.0` `C++`
+- [Crafty Controller](https://craftycontrol.com/) - Crafty Controller is a free and open-source Minecraft launcher and manager that allows users to start and administer Minecraft servers from a user-friendly interface. ([Source Code](https://gitlab.com/crafty-controller/crafty-4)) `GPL-3.0` `Docker/Python`
 - [EasyWI](https://easy-wi.com) - Easy-Wi is a Web-interface that allows you to manage server daemons like gameservers. In addition it provides you with a CMS which includes a fully automated game- and voiceserver lending service. ([Source Code](https://github.com/easy-wi/developer/)) `GPL-3.0` `PHP/Bash`
 - [Kubek](https://kubek.seeroycloud.tk) - Web management panel for Minecraft servers. ([Source Code](https://github.com/seeroy/kubek-minecraft-dashboard)) `GPL-3.0` `Nodejs`
 - [Lancache](https://lancache.net) `⚠` - LAN Party game caching made easy. ([Source Code](https://github.com/lancachenet/monolithic)) `MIT` `Docker/Shell`

non-free.md

@@ -9,6 +9,7 @@
 - [Software](#software)
   - [Automation](#automation)
   - [Communication - Custom Communication Systems](#communication---custom-communication-systems)
+  - [Communication - Email - Mailing Lists and Newsletters](#communication---email---mailing-lists-and-newsletters)
   - [Communication - SIP](#communication---sip)
   - [Content Management Systems (CMS)](#content-management-systems-cms)
   - [Document Management - E-books](#document-management---e-books)
@@ -54,6 +55,13 @@
 - [WorkAdventure](https://workadventu.re) - Virtual office / virtual conference application presented as a 16-bit RPG video game. ([Demo](https://play.staging.workadventu.re/@/tcm/workadventure/wa-village), [Source Code](https://github.com/thecodingmachine/workadventure/)) `AGPL-3.0/Commons-Clause` `Docker`
 
 
+### Communication - Email - Mailing Lists and Newsletters
+
+**[`^        back to top        ^`](##awesome-selfhosted---non-free-software)**
+
+- [Sendy](https://sendy.co) - Self-hosted email newsletter application that lets you send bulk emails via Amazon Simple Email Service (SES) or other SMTP services. `⊘ Proprietary` `PHP`
+
+
 ### Communication - SIP
 
 **[`^        back to top        ^`](##awesome-selfhosted---non-free-software)**