From b3fef555899bb074a94ff5010cbfce8d255b0eb4 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Fri, 20 Sep 2013 05:39:24 -0400 Subject: [PATCH] LicenseUpdate --- LICENSE.txt | 50 ++++++++++++++++++++++++++++++++----------------- bin/GitSync.bat | 1 + 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 54b2460d..25ffd03e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -16,14 +16,14 @@ User: Anybody that interacts with the software in one of the following ways: Mod: The mod code designated by the present license, in source form, binary form, as obtained standalone, as part of a wider distribution or resulting from the compilation of the original or modified Minecraft sources. -Mod Pack - Package distrubution of mods and there assets to be used by the user for easy install and collective download. +Mod Pack - Package distribution of mods and there assets to be used by the user for easy install and collective download. -Texture Pack - Package distrubution of texture or art work to change the visual look of the mod. +Texture Pack - Package distribution of texture or art work to change the visual look of the mod. Dependency: Code required for the Mod to work properly. This includes dependencies required to compile the code as well as any file or modification -that is explicitely or implicitely required for the Mod to be working. +that is explicatively or implicatively required for the Mod to be working. -Owner: The project leader of the Mod reguardless of repo holder or manager +Owner: The project leader of the Mod regardlessly of repo holder, manager, or developer 1. Scope -------- @@ -43,28 +43,44 @@ The user is allowed to install this Mod on a client or a server and to play with 4. Modification rights ---------------------- -The user may modify the original code for private use, learning experience, or to make a contribution to the original project source code. This does not give the right to redistrubute any part of the original or modified code. +The user may modify the original code for private use, learning experience, or to make a contribution to the original project source code. This does not give the right to redistribute any part of the original or modified code. -Mod creators that desire to create mods for the universal electricity api are given an exception to the above. That is they are allowed to copy, modify, redistribute, and include parts of the core in thier mods. This doesn't give them the right to include all parts, or include the mod as thier own work. Credit must be given for all parts used, part changed, and any content used in general. Code should only be modified as needed. For normal use the code should be called from the APIs and not actually changed. This right can be taken away at the authors discretion and is avised to still request permision in some cases. +Mod creators that desire to create mods for the universal electricity api are given an exception to the above. That is they are allowed to copy, modify, redistribute, and include parts of the core in their mods. This doesn't give them the right to include all parts, or include the mod as their own work. Credit must be given for all parts used, part changed, and any content used in general. Code should only be modified as needed. For normal use the code should be called from the APIs and not actually changed. This right can be taken away at the authors discretion and is advised to still request permission in some cases. 5. Distribution of original or modified copy rights --------------------------------------------------- -Is subject to distribution rights this entire Mod in its various forms. This -includes: -- original binary or source forms of this Mod files -- modified versions of these binaries or source files, as well as binaries resulting from source modifications +Is subject to distribution rights this entire Mod in its various forms which +includes but not limited too. +- binaries both original or modified +- source code both original or modified - patches to its source or binary files -- any copy of a portion of its binary source files +- any copy of a portion of its binaries, or source files -A) The user is NOT allowed to redistribute this Mod partially, in totality, or included in a distribution without explict permissions from the owner. With the only exceptions being for universal electricity mod developers as stated in section 4 and for the case in section 5 part B. +A) The user is NOT allowed to redistribute this Mod partially, in totality, or included in a distribution without explicate permissions from the owner. With the only exceptions being for universal electricity mod developers as stated in section 4 and for the case in section 5 part B. -B) Distrubution of this mod in a mod pack is allowed as long as the user obeys the following rules: - 1) The mod pack should not contain a major version release of the mod within one week of the mod version release to allow for bug fixes. Nor can it contain any release that is marked as test only, or dev. +B) Distribution of this mod in a mod pack is allowed as long as the user obeys the following rules: + 1) The mod pack should not contain a major version release of the mod within one week of its release to allow for bug fixes. 2) The mod pack should not contain a modified version of the mod unless to change the texture look of parts of the mod - 3) The mod pack owner or contributors must redirect errors and bug reports to the issue area of the mod's original github repo - 4) The mod pack needs full public permission from all parts of the mod pack including mods, assets, and textures. + 3) The mod pack owner or contributors must redirect issues, errors and bug reports to the issue area of the mod's original github repo + 4) The mod pack needs full public permission from all parts of the mod pack including mods, assets, and textures if it is publicly released. 5) The mod pack or its download site should allow access by users to the list of permissions and credits to authors 6) The mod pack or its download site should contain links to mod documentation and original mod sites -C) Textures of this mod are allowed to be used in the creation or modification of texture packs without permision. That is as long as links and credit to the original mod are given for easy user understanding. +C) Textures of this mod are allowed to be used in the creation or modification of texture packs without permission. That is as long as links and credit to the original mod are given for easy user understanding. + +6. Use in media creations rights +------------------------------------------------------ + +Subject of media includes pictures, films, streams, or any form of graphic based content. +This includes but is not limited to +- Youtube video uploads +- Live streams such as twitch.tv +- Game play videos created by programs like fraps + +A) The user is fully permitted to create media that show content of the mods. However the creator of the media must follow the following rules. + 1) The media can not be used to collect profit without permission + 2) The media should not deface the mod in any way. + 3) The media should follow the rules of distribution for the mod + 4) The media should give credit to the mod author + 5) At any time the author can request media to be removed diff --git a/bin/GitSync.bat b/bin/GitSync.bat index d697eff2..75898549 100644 --- a/bin/GitSync.bat +++ b/bin/GitSync.bat @@ -2,6 +2,7 @@ rem set defaults: set "com=Auto-Sync" rem set parameters: IF NOT "a%1"=="a" (set "com=%1") + cd ..\ git commit -am "%com%" git push origin master