Commit 96e2e32e authored by Stephanie Gawroriski's avatar Stephanie Gawroriski
Browse files

Merge wip-brand1!

parents 79f91e5e e182419b
Pipeline #52852 passed with stages
in 6 minutes and 43 seconds
# ---------------------------------------------------------------------------
# Multi-Phasic Applications: SquirrelJME
# SquirrelJME
# Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
# Copyright (C) Multi-Phasic Applications <multiphasicapps.net>
# ---------------------------------------------------------------------------
# SquirrelJME is under the GNU General Public License v3+, or later.
# See license.mkd for licensing and copyright information.
......
# ---------------------------------------------------------------------------
# Multi-Phasic Applications: SquirrelJME
# SquirrelJME
# Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
# Copyright (C) Multi-Phasic Applications <multiphasicapps.net>
# ---------------------------------------------------------------------------
# SquirrelJME is under the GNU General Public License v3+, or later.
# See license.mkd for licensing and copyright information.
......
# ---------------------------------------------------------------------------
# Multi-Phasic Applications: SquirrelJME
# SquirrelJME
# Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
# ---------------------------------------------------------------------------
# SquirrelJME is under the GNU General Public License v3+, or later.
......
......@@ -6,12 +6,11 @@ We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.
We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community. Consider how another person might
feel or react before speaking, posting, or linking to content.
diverse, inclusive, and healthy community.
## Our Standards
......@@ -60,11 +59,11 @@ appointed representative at an online or offline event.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at:
reported to the community leaders responsible for enforcement atP
* Via E-mail: <xerthesquirrel@gmail.com> or <xer@multiphasicapps.net>
* Via Discord: The `@Moderation` (a specific role) team on Discord.
* Via Twitter: [@MultiPhasicApps](https://twitter.com/multiphasicapps)
* Via Discord: The `@Moderator` (a specific role) team on Discord.
* Via Twitter: [@SquirrelJME](https://twitter.com/SquirrelJME)
All complaints will be reviewed and investigated promptly and fairly.
......@@ -120,14 +119,19 @@ the community.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
version 2.1, available at
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).
Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
For answers to common questions about this code of conduct, see the FAQ at
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
at [https://www.contributor-covenant.org/translations][translations].
[homepage]: https://www.contributor-covenant.org
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
......@@ -5,20 +5,19 @@ Place here why it should be merged, if applicable...
In order to make a contribution, you must agree to the contributor agreement:
```
You grant Stephanie Gawroriski (and Multi-Phasic Applications) an
irrevocable license that:
You grant Stephanie Gawroriski an irrevocable license that:
1. That you own the contributing work.
2. Grants a patent license, as per the GNU GPLv3.
3. Granting Stephanie Gawroriski (and Multi-Phasic Applications)
permission to redistribute, sell, lease, modify, transform, translate,
and relicense the specified works. This is to simplify the licensing
of the project and permit it to be consistent. Your contribution may
be commercially licensed to other parties supporting the project
through this means.
3. Granting Stephanie Gawroriski permission to redistribute, sell, lease,
modify, transform, translate, and relicense the specified works. This
is to simplify the licensing of the project and permit it to be
consistent. Your contribution may be commercially licensed to other
parties supporting the project through this means.
4. If employed by a company, you have a right by that company to provide
contributions to this project.
5. Have pledged to follow the Code of Conduct.
6. Have read and understand the Ettiquite.
```
Choose one of the following:
......
# ---------------------------------------------------------------------------
# Multi-Phasic Applications: SquirrelJME
# SquirrelJME
# Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
# ---------------------------------------------------------------------------
# SquirrelJME is under the GNU General Public License v3+, or later.
......
<component name="CopyrightManager">
<copyright>
<option name="notice" value="---------------------------------------------------------------------------&#10;Multi-Phasic Applications: SquirrelJME&#10; Copyright (C) Stephanie Gawroriski &lt;xer@multiphasicapps.net&gt;&#10;---------------------------------------------------------------------------&#10;SquirrelJME is under the GNU General Public License v3+, or later.&#10;See license.mkd for licensing and copyright information.&#10;---------------------------------------------------------------------------" />
<option name="notice" value="---------------------------------------------------------------------------&#10;SquirrelJME&#10; Copyright (C) Stephanie Gawroriski &lt;xer@multiphasicapps.net&gt;&#10;---------------------------------------------------------------------------&#10;SquirrelJME is under the GNU General Public License v3+, or later.&#10;See license.mkd for licensing and copyright information.&#10;---------------------------------------------------------------------------" />
<option name="myName" value="DefaultCopyright" />
</copyright>
</component>
\ No newline at end of file
# ---------------------------------------------------------------------------
# Multi-Phasic Applications: SquirrelJME
# SquirrelJME
# Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
# ---------------------------------------------------------------------------
# SquirrelJME is under the GNU General Public License v3+, or later.
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
// -*- Mode: Java; indent-tabs-mode: t; tab-width: 4 -*-
// ---------------------------------------------------------------------------
// Multi-Phasic Applications: SquirrelJME
// SquirrelJME
// Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
// Copyright (C) Multi-Phasic Applications <multiphasicapps.net>
// ---------------------------------------------------------------------------
// SquirrelJME is under the GNU General Public License v3+, or later.
// See license.mkd for licensing and copyright information.
......
// -*- Mode: Java; indent-tabs-mode: t; tab-width: 4 -*-
// ---------------------------------------------------------------------------
// Multi-Phasic Applications: SquirrelJME
// SquirrelJME
// Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
// Copyright (C) Multi-Phasic Applications <multiphasicapps.net>
// ---------------------------------------------------------------------------
// SquirrelJME is under the GNU General Public License v3+, or later.
// See license.mkd for licensing and copyright information.
......
// -*- Mode: Java; indent-tabs-mode: t; tab-width: 4 -*-
// ---------------------------------------------------------------------------
// Multi-Phasic Applications: SquirrelJME
// SquirrelJME
// Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
// ---------------------------------------------------------------------------
// SquirrelJME is under the GNU General Public License v3+, or later.
......
// -*- Mode: Java; indent-tabs-mode: t; tab-width: 4 -*-
// ---------------------------------------------------------------------------
// Multi-Phasic Applications: SquirrelJME
// SquirrelJME
// Copyright (C) Stephanie Gawroriski <xer@multiphasicapps.net>
// ---------------------------------------------------------------------------
// SquirrelJME is under the GNU General Public License v3+, or later.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment