From faa650cf3d6c908d5e1762a85675e47a03475f47 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 12 Apr 2017 18:46:16 +1000 Subject: [PATCH 1/2] Simplify readme --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9e3650bfb..7aa84ca71 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,9 @@ MCGalaxy Classic =============== -Minecraft Classic Custom Server Software +MCGalaxy is a **ClassiCube Server Software** based on MCForge, which is in turn based on MCLawl. - -About MCGalaxy Classic ---------------------- - -MCGalaxy classic is a classic Minecraft server software based on MCForge, which is in turn based on MCLawl. It has been released under an open-source license to allow the community to help us develop it further. We welcome all pull requests and will merge them in at our own discretion. For more information, visit [our wiki](https://github.com/Hetal728/MCGalaxy/wiki). +Pull requests are welcomed and willb be merged in at our own discretion. For more information, visit [our wiki](https://github.com/Hetal728/MCGalaxy/wiki). Contributors ------------ From fc4a8c7210bcb4f4cf7ba2d96de18d73d83c495a Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 12 Apr 2017 18:47:37 +1000 Subject: [PATCH 2/2] Update README.md --- README.md | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7aa84ca71..994ee41ff 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ MCGalaxy Classic MCGalaxy is a **ClassiCube Server Software** based on MCForge, which is in turn based on MCLawl. -Pull requests are welcomed and willb be merged in at our own discretion. For more information, visit [our wiki](https://github.com/Hetal728/MCGalaxy/wiki). +Pull requests are welcomed and will be merged in at our own discretion. For more information, visit [our wiki](https://github.com/Hetal728/MCGalaxy/wiki). Contributors ------------ @@ -18,17 +18,4 @@ A good habbit would be to *first* make some couple of commitments, then BEFORE p Copyright/License ----------------- - -Unless otherwise noted, this software and its source code is -Copyright 2015 MCGalaxy, 2011 MCForge & Copyright 2012 David Mitchell. licensed under the [MIT][3] - -In an effort to add copyright notices to the source code, we utilized automated methods to insert these. -Some copyright attributions may be incorrect. If you identify any such cases, please notify us immediately so we may correct it. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -It is also required that any derivative works clearly state that they are based off of MCGalaxy Scorce code. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +See LICENSE for MCGalaxy license, and license.txt for code used from other software.