diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5cc6e92..fa52497 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,3 +13,15 @@ with For general discussions, feature brainstorming, etc. visit our [discussions page](https://github.com/yds12/tarsila/discussions). +## License + +Licensed under either of + * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or + http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or + http://opensource.org/licenses/MIT) at your option. + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall +be dual licensed as above, without any additional terms or conditions. + diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 0000000..c7b748e --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,14 @@ +Copyright 2023 Tarsila 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. + diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 0000000..9a8e66a --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2023 Tarsila Contributors + +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. + +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. diff --git a/README.md b/README.md index 1ff5590..45872a0 100644 --- a/README.md +++ b/README.md @@ -44,3 +44,17 @@ Some of the main gaps currently are: Visit our [issues page](https://github.com/yds12/tarsila/issues) for known problems/bugs. +## License + +Licensed under either of + * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or + http://www.apache.org/licenses/LICENSE-2.0) + * MIT license ([LICENSE-MIT](LICENSE-MIT) or + http://opensource.org/licenses/MIT) at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall +be dual licensed as above, without any additional terms or conditions. + diff --git a/egui-macroquad/Cargo.toml b/egui-macroquad/Cargo.toml index b7c2d84..16c2d38 100644 --- a/egui-macroquad/Cargo.toml +++ b/egui-macroquad/Cargo.toml @@ -3,7 +3,7 @@ name = "egui-macroquad-fork" authors = ["Ilya Sheprut ", "Y. D. Santos "] version = "0.1.0" edition = "2021" -license = "MIT" +license = "MIT/Apache-2.0" homepage = "https://github.com/yds12/tarsila" repository = "https://github.com/yds12/tarsila" description = "Bindings between egui and macroquad" diff --git a/egui-macroquad/LICENSE-APACHE b/egui-macroquad/LICENSE-APACHE new file mode 100644 index 0000000..c7b748e --- /dev/null +++ b/egui-macroquad/LICENSE-APACHE @@ -0,0 +1,14 @@ +Copyright 2023 Tarsila 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. + diff --git a/egui-macroquad/LICENSE-MIT b/egui-macroquad/LICENSE-MIT new file mode 100644 index 0000000..9a8e66a --- /dev/null +++ b/egui-macroquad/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2023 Tarsila Contributors + +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. + +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. diff --git a/lapix/Cargo.toml b/lapix/Cargo.toml index c397b96..a05ae2b 100644 --- a/lapix/Cargo.toml +++ b/lapix/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" documentation = "https://docs.rs/lapix/latest/" keywords = ["image", "pixel", "pixel-art", "image-editor", "editor"] categories = ["game-development", "graphics", "multimedia", "multimedia::images", "rendering"] -license = "MIT" +license = "MIT/Apache-2.0" [dependencies] bincode = "1.3.3" diff --git a/lapix/LICENSE-APACHE b/lapix/LICENSE-APACHE new file mode 100644 index 0000000..c7b748e --- /dev/null +++ b/lapix/LICENSE-APACHE @@ -0,0 +1,14 @@ +Copyright 2023 Tarsila 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. + diff --git a/lapix/LICENSE-MIT b/lapix/LICENSE-MIT new file mode 100644 index 0000000..9a8e66a --- /dev/null +++ b/lapix/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2023 Tarsila Contributors + +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. + +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. diff --git a/tarsila/Cargo.toml b/tarsila/Cargo.toml index 9dcb7a2..d6fd16e 100644 --- a/tarsila/Cargo.toml +++ b/tarsila/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" documentation = "https://docs.rs/tarsila/latest/" keywords = ["image", "pixel", "pixel-art", "image-editor", "editor"] categories = ["game-development", "graphics", "multimedia", "multimedia::images", "rendering"] -license = "MIT" +license = "MIT/Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tarsila/LICENSE-APACHE b/tarsila/LICENSE-APACHE new file mode 100644 index 0000000..c7b748e --- /dev/null +++ b/tarsila/LICENSE-APACHE @@ -0,0 +1,14 @@ +Copyright 2023 Tarsila 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. + diff --git a/tarsila/LICENSE-MIT b/tarsila/LICENSE-MIT new file mode 100644 index 0000000..9a8e66a --- /dev/null +++ b/tarsila/LICENSE-MIT @@ -0,0 +1,25 @@ +Copyright (c) 2023 Tarsila Contributors + +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. + +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.