From af6c75a63eaab2420537be21cc81e7ce634177bc Mon Sep 17 00:00:00 2001 From: Erick Date: Mon, 23 Aug 2021 10:37:32 -0300 Subject: [PATCH] Changing where needed to reference Blue Fire instead of Fireslime (#925) * Changing where needed to reference Blue Fire instead of Fireslime * Fixing the remaining references * Making LICENSE files 'real files' * fixing references on the ES file --- .github/FUNDING.yml | 2 +- FAQ.md | 4 ++-- LICENSE | 2 +- README.md | 6 +++--- doc/palette.md | 2 +- examples/README.md | 2 +- i18n/README-ES.md | 8 ++++---- i18n/README-PL.md | 8 ++++---- i18n/README-RU.md | 6 +++--- i18n/README-ZH.md | 4 ++-- packages/flame/LICENSE | 23 ++++++++++++++++++++++- packages/flame_audio/LICENSE | 23 ++++++++++++++++++++++- packages/flame_fire_atlas/LICENSE | 23 +++++++++++++++++++---- packages/flame_forge2d/LICENSE | 2 +- packages/flame_svg/LICENSE | 23 ++++++++++++++++++++++- tutorials/LICENSE | 21 --------------------- 16 files changed, 108 insertions(+), 51 deletions(-) mode change 120000 => 100644 packages/flame/LICENSE mode change 120000 => 100644 packages/flame_audio/LICENSE mode change 120000 => 100644 packages/flame_svg/LICENSE delete mode 100644 tutorials/LICENSE diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index f5c138f2d..fd9580565 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -patreon: fireslime +patreon: bluefireoss diff --git a/FAQ.md b/FAQ.md index 030b4f2ee..d15308c41 100644 --- a/FAQ.md +++ b/FAQ.md @@ -54,12 +54,12 @@ However there is another root which showcases most of the features that exist in Flame. If you want a more full-fledged game, please check: - - [BGUG](https://github.com/fireslime/bgug): FireSlime's open source fast paced side-scrolling + - [BGUG](https://github.com/bluefireteam/bgug): Blue Fire's open source fast paced side-scrolling platformer. It is mostly up-to-date with Flame and uses a good chunk of the features offered by the engine. - [renancaraujo](https://github.com/renancaraujo)'s port of the [trex](https://github.com/flame-engine/trex-flame) Chrome game in Flame - - [Bob Box](https://github.com/fireslime/bounce_box): which is easy to grasp and a good display of + - [Bob Box](https://github.com/bluefireteam/bounce_box): which is easy to grasp and a good display of our core features. ## What is the difference between Game and BaseGame? diff --git a/LICENSE b/LICENSE index e4c736911..3897c4d09 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Luan Nico +Copyright (c) 2021 Blue Fire Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index c051f793c..f93478b7a 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The official site for Flame, which also contains the documentation can be found ## Help -We have a Flame help channel on Fireslime's Discord, join it [here](https://discord.gg/pxrBmy4). +We have a Flame help channel on Blue Fire's Discord, join it [here](https://discord.gg/5unKpdQD78). We also have a [FAQ](FAQ.md), so please search for your question there first. @@ -90,11 +90,11 @@ The simplest way to show us your support is by giving the project a star. You can also support us by becoming a patron on Patreon: -[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/fireslime) +[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/bluefireoss) Or by making a single donation by buying us a coffee: -[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/fireslime) +[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/bluefire) You can also show on your repository that your game is made with Flame by using one of the following badges: diff --git a/doc/palette.md b/doc/palette.md index 99a7b3ed4..5f7898b77 100644 --- a/doc/palette.md +++ b/doc/palette.md @@ -60,7 +60,7 @@ canvas.drawRect(rect, BasicPalette.black.paint); However, the idea is that you can create your own palette, following the `BasicPalette` example, and add the color palette/scheme of your game. Then you will be able to statically access any color in your components and classes. Below is an example of a `Palette` implementation, from the example -game [BGUG](https://github.com/fireslime/bgug/blob/master/lib/palette.dart): +game [BGUG](https://github.com/bluefireteam/bgug/blob/master/lib/palette.dart): ```dart import 'dart:ui'; diff --git a/examples/README.md b/examples/README.md index 3eacf0071..530bd693d 100644 --- a/examples/README.md +++ b/examples/README.md @@ -27,6 +27,6 @@ If you have questions about this: - Check our extensive documentation, links to which can be found [on the main repo](https://github.com/flame-engine/flame) (faq, docs folder, code/api docs, tutorials, flame-awesome). - - Join [Fireslime's Discord](https://discord.gg/pxrBmy4), we have a #flame channel where you can + - Join [Blue Fire's Discord](https://discord.gg/5unKpdQD78), we have a #flame channel where you can find lots of people to help and get help from. - Use the `flame` tag on StackOverflow. diff --git a/i18n/README-ES.md b/i18n/README-ES.md index c91533e8f..e3e578cec 100644 --- a/i18n/README-ES.md +++ b/i18n/README-ES.md @@ -59,7 +59,7 @@ El sitio oficial de Flame, el cual también contiene la documentación se puede ## Ayuda -Tenemos un canal de ayuda en el servidor de Discord Fireslime, únete [aquí](https://discord.gg/pxrBmy4). +Tenemos un canal de ayuda en el servidor de Discord Blue Fire, únete [aquí](https://discord.gg/pxrBmy4). También contamos con un [FAQ](FAQ.md), por favor busque su respuesta primero ahí. @@ -88,11 +88,11 @@ La forma más simple de mostrar su apoyo a este proyecto es dando una estrella. También puede apoyarnos convirtiéndose patrón en Patreon: -[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/fireslime) +[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/bluefireoss) O realizando una única donación al comprarnos un café: -[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/fireslime) +[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/bluefire) Además puede mostrar en su repositorio que su juego está hecho con Flame al utilizar una de las siguientes insignias: @@ -141,4 +141,4 @@ Tome a consideración que algunos de los artículos podrían estar algo desactua - El [Flame Engine team](https://github.com/orgs/flame-engine/people), quienes están trabajando continuamente en mantener y mejorar Flame. - Todos los amables contribuidores y las personas que ayudan en la comunidad. - - \ No newline at end of file + - diff --git a/i18n/README-PL.md b/i18n/README-PL.md index 924405136..7b79a95ef 100644 --- a/i18n/README-PL.md +++ b/i18n/README-PL.md @@ -21,7 +21,7 @@ A minimalistic Flutter game engine. ## Pomoc -Mamy kanał pomocy Flame na Discord Fireslime, dołącz do niego [tutaj](https://discord.gg/pxrBmy4). +Mamy kanał pomocy Flame na Discord Blue Fire, dołącz do niego [tutaj](https://discord.gg/5unKpdQD78). Mamy też najczęściej zadawane pytania - [FAQ](FAQ.md), więc najpierw wyszukaj tam swoje pytanie. @@ -48,11 +48,11 @@ Najprostszym sposobem, aby pokazać nam swoje wsparcie, jest przyznanie gwiazdki Możesz nas wesprzeć, zostając patronem na Patreon: -[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/fireslime) +[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/bluefireoss) Lub przekazując jakąś darowiznę, kupując nam kawę: -[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/fireslime) +[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/bluefire) Możesz również pokazać w swoim repozytorium, że twoja gra została wykonana przy użyciu Flame'a, używając jednej z następujących odznak: @@ -98,7 +98,7 @@ Oficjalną stronę Flame, która zawiera również dokumentację, można znaleź ## Uznanie - * [Fireslime](https://fireslime.xyz), zespół odpowiedzialny za utrzymanie Flame'a. + * [Blue Fire](https://patreon.com/bluefireoss), zespół odpowiedzialny za utrzymanie Flame'a. * Wszyscy życzliwi współtwórcy i ludzie, którzy pomagają w społeczności. * [Luanpotter](https://github.com/luanpotter)'a (założyciel Flame) biblioteka [audioplayers](https://github.com/luanpotter/audioplayer) lib, która z kolei jest rozwidlona (zforkowana) z [rxlabz's](https://github.com/rxlabz/audioplayer). * Port Dart w [Box2D](https://github.com/google/box2d.dart). diff --git a/i18n/README-RU.md b/i18n/README-RU.md index a9e0f684b..9aae75745 100644 --- a/i18n/README-RU.md +++ b/i18n/README-RU.md @@ -76,11 +76,11 @@ Так же вы можете оказать нам финансовую поддержку став патроном на Patreon: -[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/fireslime) +[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/bluefireoss) Или сделав разовое пожертвование, купив нам кофе: -[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/fireslime) +[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/bluefire) Еще вы можете показать в своем репозитории что ваш проект сделан с использованием Flame, поместив туда один из бейджей: @@ -121,7 +121,7 @@ __ВНИМАНИЕ__: Мы работаем над доведением Flame д ## Благодарности - * [Fireslime](https://fireslime.xyz), команда ответственная за поддержку Flame. + * [Blue Fire](https://patreon.com/bluefireoss), команда ответственная за поддержку Flame. * Все дружелюбные участники и люди которые помогают в сообществе. * [Luanpotter](https://github.com/luanpotter)'s основатель Flame и [audioplayers](https://github.com/luanpotter/audioplayer) библиотеки, которая является форком [rxlabz's](https://github.com/rxlabz/audioplayer). * Дарт порт [Box2D](https://github.com/google/box2d.dart). diff --git a/i18n/README-ZH.md b/i18n/README-ZH.md index c021e2bb0..4f4b44e5b 100644 --- a/i18n/README-ZH.md +++ b/i18n/README-ZH.md @@ -90,11 +90,11 @@ Flame 的官方网站（包含文档），请 [访问此处](https://flame-engin 你也可以成为赞助者，通过 Patreon 来支持我们： -[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/fireslime) +[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/bluefireoss) 或者通过 Buy Me A Coffee 捐赠我们： -[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/fireslime) +[![Buy Me A Coffee](https://user-images.githubusercontent.com/835641/60540201-fcd7fa00-9ce4-11e9-87ec-1e98568e9f58.png)](https://www.buymeacoffee.com/bluefire) 你也可以在仓库中展示下面的其中一个徽章，表示游戏是通过 Flame 制作的，来支持我们: diff --git a/packages/flame/LICENSE b/packages/flame/LICENSE deleted file mode 120000 index 30cff7403..000000000 --- a/packages/flame/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/packages/flame/LICENSE b/packages/flame/LICENSE new file mode 100644 index 000000000..3897c4d09 --- /dev/null +++ b/packages/flame/LICENSE @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) 2021 Blue Fire + +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/packages/flame_audio/LICENSE b/packages/flame_audio/LICENSE deleted file mode 120000 index 30cff7403..000000000 --- a/packages/flame_audio/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/packages/flame_audio/LICENSE b/packages/flame_audio/LICENSE new file mode 100644 index 000000000..3897c4d09 --- /dev/null +++ b/packages/flame_audio/LICENSE @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) 2021 Blue Fire + +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/packages/flame_fire_atlas/LICENSE b/packages/flame_fire_atlas/LICENSE index d3e5d9bc2..3897c4d09 100644 --- a/packages/flame_fire_atlas/LICENSE +++ b/packages/flame_fire_atlas/LICENSE @@ -1,7 +1,22 @@ -Copyright 2020 Flame engine +MIT License -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: +Copyright (c) 2021 Blue Fire -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +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. -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/packages/flame_forge2d/LICENSE b/packages/flame_forge2d/LICENSE index c0c993431..3897c4d09 100644 --- a/packages/flame_forge2d/LICENSE +++ b/packages/flame_forge2d/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Flame Org +Copyright (c) 2021 Blue Fire Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/packages/flame_svg/LICENSE b/packages/flame_svg/LICENSE deleted file mode 120000 index 30cff7403..000000000 --- a/packages/flame_svg/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE \ No newline at end of file diff --git a/packages/flame_svg/LICENSE b/packages/flame_svg/LICENSE new file mode 100644 index 000000000..3897c4d09 --- /dev/null +++ b/packages/flame_svg/LICENSE @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) 2021 Blue Fire + +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/tutorials/LICENSE b/tutorials/LICENSE deleted file mode 100644 index e719076cf..000000000 --- a/tutorials/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021 Flame Engine - -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.