Merge branch 'Epix-Incorporated:master' into master

EasternBloxxer · Sep 6, 2024 · cb79556 · cb79556
2 parents ae4eb0b + d51339e
commit cb79556
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/MainModule/Client/UI/Default/Notif.rbxmx b/MainModule/Client/UI/Default/Notif.rbxmx
@@ -54,6 +54,7 @@ return function(data, env)
 	local label = gui.LABEL
 	local str = data.Message
 	local topbar = client.UI.Get("TopBar")
+	local topshift
 
 	client.UI.Remove("Notif",script.Parent.Parent)
 
@@ -68,11 +69,17 @@ return function(data, env)
 
 	table.insert(client.Variables.CommunicationsHistory, log) 
 	service.Events.CommsPanel:Fire(log)
+
+	if client.Variables.TopBarShift == true then
+		topshift = true
+	else
+		topshift = false
+	end
 
 
 	if str and type(str)=="string" then
 		label.Text = str
-		label.Position = UDim2.new(0, 0, 0, ((topbar and 40) or 0) - 35)
+		label.Position = UDim2.new(0, 0, 0, ((topshift and 0) or -35))
 		gTable:Ready()
 	else
 		gui:Destroy()

diff --git a/MainModule/Server/Commands/Moderators.luau b/MainModule/Server/Commands/Moderators.luau
@@ -1351,6 +1351,7 @@ return function(Vargs, env)
 					Size = {300, 240};
 					AutoUpdate = if not args[1] or (args[1]:lower() == "true" or args[1]:lower() == "yes") then 1 else nil;
 					Update = "PlayerList";
+					TextSelectable = true;
 				})
 			end
 		};

diff --git a/MainModule/Server/Shared/Changelog.luau b/MainModule/Server/Shared/Changelog.luau
@@ -1,14 +1,19 @@
 return {
-	"Version: 261";
+	"Version: 261 [Pre-release – Alpha]";
 	"*Drag edges to expand*";
 	"*Report bugs/issues on our GitHub repository*";
 	"";
-	"[v261 2024-xx-xx xx:xx UTC] @Maintainer";
+	"[v261 Pre-release 2024-08-29 14:32 UTC] @Dimenpsyonal";
+	"#Not for release until the following issues are resolved:";
+	"#Audit logs need be integrated into datastore";
 	"(Git/Mars7383) Fix typo in Loadstring dependency affecting :ss (#1587)";
 	"(Git/bsqi) Fix Join command (#1584)";
 	"(Git/24rr) New System: Audit Logs (#1568)";
 	"(Git/24rr) New Command: coordinates (#1568)";
 	"(Git/PurpleCreativity) Remove ;cut command (#1590)";
+	"(Git/EasternBloxxer) Made dex fetch api dump on server start (#1591)";
+	"(Git/ScriptedConnor) Fix TopBarShift for :setmessage (#1593)";
+	"(Git/ScriptedConnor) Add Text Selections to the :players Command (#1597)";
 	"";
 	"[Patch v260.2 2024-08-11 21:50 UTC] @Dimenpsyonal";
 	"Fix alias arguments (#1581)";

diff --git a/MainModule/Server/Shared/Credits.luau b/MainModule/Server/Shared/Credits.luau
@@ -4,9 +4,9 @@ return {
 		{Text = "Kohltastrophe (Scripth)",	Desc = "For his help with various things and some code"};
 		{Text = "einsteinK",				Desc = "Helped me with some scripting problems early in development and put together the LoadstringParser; Best programmer I know"};
 		{Text = "Rerumu (Shining_Diamando)",Desc = "Numerous contributions (Endless stairs, FiOne, Parser, Steampunk theme)"};
-		{Text = "Cald_fan", 				Desc = "Community Maintainer & WebPanel Creator & Maintainer"};
-		{Text = "joritochip",				Desc = "Community Maintainer & WebPanel Developer"};
-		{Text = "Coasterteam",				Desc = "Community Maintainer & Development contributions (Kronos developer)"};
+		{Text = "Cald_fan", 				Desc = "WebPanel Maintainer & Creator"};
+		{Text = "joritochip",				Desc = "Senior Maintainer & WebPanel Developer"};
+		{Text = "Coasterteam",				Desc = "Senior Maintainer & Development contributions (Kronos developer)"};
 		{Text = "Expertcoderz",				Desc = "Community Maintainer"};
 		{Text = "Dimenpsyonal",				Desc = "Community Maintainer"};
 	};
@@ -96,6 +96,7 @@ return {
 		{Text = "@Hedreon", 		Desc = "Open Source Contributor"};
 		{Text = "@Mars7383", 		Desc = "Open Source Contributor"};
 		{Text = "@PurpleCreativity",Desc = "Open Source Contributor"};
+		{Text = "@ScriptedConnor",	Desc = "Open Source Contributor"};
 	};
 
 	Misc = {