Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into release #1793

Merged
merged 2 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MainModule/Server/Core/Functions.luau
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ return function(Vargs, GetEnv)
if #tab>=num then
break
elseif #tab>=num-1 then
table.insert(tab,string.sub(msg,#str+#tab+(if str.." " == key or #(str.." ")==5 then 0 elseif #(str.." ")<5 then num-2 elseif (#(str.." ") > num or #(str.."") == num) then -1 else 2),#msg))
table.insert(tab,string.sub(msg,#str+3,#msg))
continue
end

Expand Down
1 change: 1 addition & 0 deletions MainModule/Server/Shared/Changelog.luau
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ return {
"*Report bugs/issues on our GitHub repository*";
"";
"[Patch v261.1 2024-12-20 20:02 UTC] @Dimenpsyonal";
"Revert argument handling change";
"(Git/WalkerOfBacon) Fix string parsing (#1789)";
"(Git/WalkerOfBacon) Fix argument handling AGAIN (#1791)";
"";
Expand Down
Loading