Skip to content

Commit

Permalink
Merge branch 'Epix-Incorporated:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Expertcoderz authored Jan 11, 2025
2 parents 01ca703 + 0cf0aa0 commit 8cb22c9
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 80 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ jobs:
path: ${{ steps.naming.outputs.output_name }}.rbxm

- name: Build Loader
run: rojo build -o loader.rbxm .github/loader.deploy.project.json
run: rojo build -o Adonis_Loader.rbxm .github/loader.deploy.project.json

- name: Build MainModule
run: rojo build -o module.rbxm .github/module.deploy.project.json
run: rojo build -o Adonis_MainModule.rbxm .github/module.deploy.project.json

- name: Build Alerts Module
run: rojo build -o alertsmodule.rbxm .github/alerts.deploy.project.json

run: rojo build -o Adonis_AlertsModule.rbxm .github/alerts.deploy.project.json
- name: Send Standalone Release to Discord channel
uses: tsickert/[email protected]
with:
Expand All @@ -87,7 +87,7 @@ jobs:
url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.LOADER_ID }}"
method: "POST"
contentType: "multipart/form-data"
files: '{ "file": "loader.rbxm" }'
files: '{ "file": "Adonis_Loader.rbxm" }'
customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
timeout: 10000

Expand All @@ -97,7 +97,7 @@ jobs:
url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.MODULE_ID }}"
method: "POST"
contentType: "multipart/form-data"
files: '{ "file": "module.rbxm" }'
files: '{ "file": "Adonis_MainModule.rbxm" }'
customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
timeout: 10000

Expand All @@ -107,6 +107,6 @@ jobs:
url: "${{ secrets.PUBURL2 }}/?assetId=${{ secrets.ALERTS_MODULE_ID }}"
method: "POST"
contentType: "multipart/form-data"
files: '{ "file": "alertsmodule.rbxm" }'
files: '{ "file": "Adonis_AlertsModule.rbxm" }'
customHeaders: '{ "upload-secret": "${{ secrets.PUBURL2_SECRET }}" }'
timeout: 10000
2 changes: 1 addition & 1 deletion LICENSE.luau
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
MIT License
Copyright (c) 2016-2024 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
Copyright (c) 2016-2025 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2024 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.
Copyright (c) 2016-2025 Sceleratis (https://github.com/Sceleratis), Epix Incorporated, and the Adonis Community.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 1 addition & 2 deletions MainModule/Client/UI/Default/PrivateChat.luau
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ return function(data, env)
Parent = chatlog;
FillDirection = "Vertical";
HorizontalAlignment = "Left";
VerticalAlignment = "Bottom";
VerticalAlignment = "Top";
SortOrder = "LayoutOrder";
})

Expand Down Expand Up @@ -358,7 +358,6 @@ return function(data, env)
local p = vargs[1]
local message = vargs[2]
if newMessage then
print('sdf')
newMessage({
PlayerName = p.Name;
PlayerDisplayName = p.DisplayName;
Expand Down
Loading

0 comments on commit 8cb22c9

Please sign in to comment.