Skip to content

Commit

Permalink
NOISSUE Change license to MS-PL
Browse files Browse the repository at this point in the history
This is a free software license, the only practical change is that
when you fork the code and want to keep it open, you have to keep
the license - that is, you have to share the code changes you make
with *EVERYONE*, not just whoever you choose.
  • Loading branch information
peterix committed Feb 16, 2022
1 parent 3ca6611 commit a08a882
Show file tree
Hide file tree
Showing 305 changed files with 1,003 additions and 3,418 deletions.
69 changes: 57 additions & 12 deletions COPYING.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,62 @@
# MultiMC

Copyright 2012-2021 MultiMC Contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Copyright 2012-2022 MultiMC Contributors

This license governs use of the accompanying software. If you use the
software, you accept this license. If you do not accept the license,
do not use the software.

1. Definitions

The terms "reproduce," "reproduction," "derivative works,"
and "distribution" have the same meaning here as under U.S. copyright law.

A "contribution" is the original software, or any additions or changes to the software.

A "contributor" is any person that distributes its contribution under this license.

"Licensed patents" are a contributor's patent claims that read directly on its contribution.

2. Grant of Rights

(A) Copyright Grant- Subject to the terms of this license, including
the license conditions and limitations in section 3, each contributor
grants you a non-exclusive, worldwide, royalty-free copyright license
to reproduce its contribution, prepare derivative works of its contribution,
and distribute its contribution or any derivative works that you create.

(B) Patent Grant- Subject to the terms of this license, including
the license conditions and limitations in section 3, each contributor
grants you a non-exclusive, worldwide, royalty-free license under its
licensed patents to make, have made, use, sell, offer for sale, import,
and/or otherwise dispose of its contribution in the software or
derivative works of the contribution in the software.

3. Conditions and Limitations

(A) No Trademark License- This license does not grant you rights to
use any contributors' name, logo, or trademarks.

(B) If you bring a patent claim against any contributor over patents
that you claim are infringed by the software, your patent license
from such contributor to the software ends automatically.

(C) If you distribute any portion of the software, you must retain
all copyright, patent, trademark, and attribution notices that are
present in the software.

(D) If you distribute any portion of the software in source code form,
you may do so only under this license by including a complete copy
of this license with your distribution. If you distribute any portion
of the software in compiled or object code form, you may only do so
under a license that complies with this license.

(E) The software is licensed "as-is." You bear the risk of using it.
The contributors give no express warranties, guarantees or conditions.
You may have additional consumer rights under your local laws which
this license cannot change. To the extent permitted under your local
laws, the contributors exclude the implied warranties of merchantability,
fitness for a particular purpose and non-infringement.

# MinGW runtime (Windows)

Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,18 @@ Translations can be done [on crowdin](https://translate.multimc.org). Please avo
## License
Copyright © 2013-2022 MultiMC Contributors

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this program except in compliance with the License. You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
The launcher source is subject to the Microsoft Permissive License (MS-PL).
Code of the bundled libraries uses various compatible licenses.

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
Please see the [COPYING.md](COPYING.md file) for more information.

## Forking/Redistributing/Custom builds policy
We keep Launcher open source because we think it's important to be able to see the source code for a project like this, and we do so using the Apache license.
We keep MultiMC open source because we think it's important to be able to see the source code for a project like this, and we do so using the Microsoft Permissive License (MS-PL).

The license gives you access to the source MultiMC is build from, but:
The license gives you access to the source MultiMC is built from, but:
- Not the name, logo and other branding.
- Not the API tokens required to talk to services the launcher depends on.
- You may not change the license.

Because of the nature of the agreements required to interact with the Microsoft identity platform, it's impossible for us to continue allowing everyone to build the code as 'MultiMC'. The source code has been debranded and now builds as `DevLauncher` by default.

Expand Down
6 changes: 6 additions & 0 deletions buildconfig/BuildConfig.cpp.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/* Copyright 2013-2022 MultiMC Contributors
*
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#include "BuildConfig.h"
#include <QObject>

Expand Down
6 changes: 6 additions & 0 deletions buildconfig/BuildConfig.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/* Copyright 2013-2022 MultiMC Contributors
*
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once
#include <QString>

Expand Down
15 changes: 3 additions & 12 deletions launcher/BaseInstaller.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#include <QFile>
Expand Down
15 changes: 3 additions & 12 deletions launcher/BaseInstaller.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once
Expand Down
15 changes: 3 additions & 12 deletions launcher/BaseInstance.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#include "BaseInstance.h"
Expand Down
15 changes: 3 additions & 12 deletions launcher/BaseInstance.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once
Expand Down
15 changes: 3 additions & 12 deletions launcher/BaseVersion.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once
Expand Down
15 changes: 3 additions & 12 deletions launcher/BaseVersionList.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#include "BaseVersionList.h"
Expand Down
15 changes: 3 additions & 12 deletions launcher/BaseVersionList.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once
Expand Down
19 changes: 4 additions & 15 deletions launcher/Commandline.cpp
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Authors: Orochimarufan <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#include "Commandline.h"
Expand Down Expand Up @@ -480,4 +469,4 @@ void Parser::getPrefix(QString &opt, QString &flag)
ParsingError::ParsingError(const QString &what) : std::runtime_error(what.toStdString())
{
}
}
}
17 changes: 3 additions & 14 deletions launcher/Commandline.h
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Authors: Orochimarufan <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once
Expand Down
6 changes: 5 additions & 1 deletion launcher/Exception.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
// Licensed under the Apache-2.0 license. See README.md for details.
/* Copyright 2013-2022 MultiMC Contributors
*
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once

Expand Down
6 changes: 5 additions & 1 deletion launcher/FileSystem.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
// Licensed under the Apache-2.0 license. See README.md for details.
/* Copyright 2013-2022 MultiMC Contributors
*
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#include "FileSystem.h"

Expand Down
6 changes: 5 additions & 1 deletion launcher/FileSystem.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
// Licensed under the Apache-2.0 license. See README.md for details.
/* Copyright 2013-2022 MultiMC Contributors
*
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once

Expand Down
15 changes: 3 additions & 12 deletions launcher/HoeDown.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once
Expand Down
15 changes: 3 additions & 12 deletions launcher/InstanceImportTask.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#include "InstanceImportTask.h"
Expand Down
15 changes: 3 additions & 12 deletions launcher/InstanceImportTask.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
/* Copyright 2013-2021 MultiMC Contributors
/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* This source is subject to the Microsoft Permissive License (MS-PL).
* Please see the COPYING.md file for more information.
*/

#pragma once
Expand Down
Loading

5 comments on commit a08a882

@jamierocks
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Peterix,

I didn't give permission to relicence my contributions to the project. I would appreciate that my licence headers remain to reflect that the work is based on an Apache work.

Thanks,
Jamie

@peterix
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apache 2.0 does not require any permission for that. You can sublicense the work and do whatever you want with it.

The attribution, yes. I'll see which files need that. Attribution in general needs some work.

@jamierocks
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fully aware that you can sublicence, however you've changed copyright headers and removed note of the Apache licence which much code is derivative of. I, for example, went through the effort of making sure substantial work by myself had accurate copyright headers.

You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and

@peterix
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I took care to not erase the (C)s. Will go over it to make sure they are present.

They may not have been in every file you touched. Let's fix that.

@jamierocks
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The (c)s aren't the issue, removing the Apache header is the issue.

Please sign in to comment.