Merge branch 'Epix-Incorporated:master' into master

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     name: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].7
 
       - name: Layout file name
         id: naming
@@ -56,7 +56,7 @@ jobs:
       - name: Build
         run: rojo build -o ${{ steps.naming.outputs.output_name }}.rbxm .github/build.project.json
 
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].6
         with:
           name: ${{ steps.naming.outputs.output_name }}
           path: ${{ steps.naming.outputs.output_name }}.rbxm
@@ -75,7 +75,7 @@ jobs:
           filename: ${{ steps.naming.outputs.output_name }}.rbxm
 
       - name: Publish Nightly MainModule
-        uses: fjogeleit/http-request-action@v1.15.4
+        uses: fjogeleit/http-request-action@v1.16.1
         if: github.repository == 'Epix-Incorporated/Adonis' && github.event_name == 'push' && github.ref_name == 'master'
         with:
           url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.NIGHTLY_MODULE_ID }}"

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/[email protected].4
+    - uses: actions/[email protected].7
 
     - uses: ok-nick/[email protected]
       with:

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].1  # Using the latest version
+      - uses: actions/[email protected].7  # Using the latest version
         with:
           ref: refs/heads/release
 
@@ -58,7 +58,7 @@ jobs:
       - name: Build Standalone
         run: rojo build -o ${{ steps.naming.outputs.output_name }}.rbxm .github/build.project.json
 
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].6
         with:
           name: ${{ steps.naming.outputs.output_name }}
           path: ${{ steps.naming.outputs.output_name }}.rbxm
@@ -76,7 +76,7 @@ jobs:
           filename: ${{ steps.naming.outputs.output_name }}.rbxm
 
       - name: Publish Loader
-        uses: fjogeleit/http-request-action@v1.15.4
+        uses: fjogeleit/http-request-action@v1.16.1
         with:
           url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.LOADER_ID }}"
           method: "POST"
@@ -86,7 +86,7 @@ jobs:
           timeout: 10000
 
       - name: Publish Module
-        uses: fjogeleit/http-request-action@v1.15.4
+        uses: fjogeleit/http-request-action@v1.16.1
         with:
           url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.MODULE_ID }}"
           method: "POST"

.github/workflows/rebase.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/[email protected].1
+        uses: actions/[email protected].7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0 # otherwise, you will fail to push refs to dest repo

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+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.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an 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
+our Discord server.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+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.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+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.

CONTRIBUTING.md

@@ -63,7 +63,7 @@ After installing Rojo, you can serve it by running `rojo serve` or by using the
 
 ## Q: What can I contribute to the Wiki?
 
-**A:** Wiki contributions should focus on technical information, such as what various functions and variables do/are for and how to use them correctly when developing plugins for Adonis. Information about Adonis and useful tutorials for new or inexperienced users is also acceptable (and much welcomed.)
+**A:** Wiki contributions should focus on technical information, such as what various functions and variables do/are for and how to use them correctly when developing plugins for Adonis. Information about Adonis and useful tutorials for new or inexperienced users is also acceptable (and much welcomed.) To add wiki contributions, message a maintainer with information regarding your requested fix and it will be reviewed.
 
 ## Q: My contribution was accepted. Now what?
 
@@ -85,6 +85,6 @@ Discord server: <https://discord.com/invite/H5RvTP3>
 
 Feel free to make enquiries on our Discord server.
 
-<sub>Adonis Contribution Guide 2022</sub>
+<sub>Adonis Contribution Guide 2024</sub>
 
 </div>

Loader/Config/Settings.luau

@@ -482,7 +482,6 @@ descs.AutoClean = [[ Will auto clean workspace of things like hats and tools ]]
 descs.AutoBackup = [[ (not recommended) Run a map backup command when the server starts, this is mostly useless as clients cannot modify the server. To restore the map run :restoremap ]]
 descs.AutoCleanDelay = [[ Time between auto cleans ]]
 
-descs.CustomChat = [[ Custom chat ]]
 descs.PlayerList = [[ Custom playerlist ]]
 
 descs.Console = [[ Command console ]]
@@ -599,7 +598,6 @@ order = {
 	"AutoCleanDelay";
 	"AutoBackup";
 	" ";
-	"CustomChat";
 	"PlayerList";
 	" ";
 	"Console";

Loader/Version.model.json

@@ -1,6 +1,6 @@
 {
 	"ClassName": "NumberValue",
 	"Properties": {
-		"Value": 259
+		"Value": 261
 	}
 }

MainModule/Client/Core/UI.luau

@@ -423,14 +423,10 @@ return function(Vargs, GetEnv)
 		end;
 
 		Remove = function(name, ignore)
-			if name == "Chat" and client.Handlers.RemoveCustomChat then
-				client.Handlers.RemoveCustomChat()
-			else
-				local gui = UI.Get(name, ignore)
-				if gui then
-					for i,v in gui do
-						v.Destroy()
-					end
+			local gui = UI.Get(name, ignore)
+			if gui then
+				for i,v in gui do
+					v.Destroy()
 				end
 			end
 		end;