Skip to content

Commit

Permalink
Merging from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@raulssorban
raulssorban committed Sep 7, 2024
2 parents a99bee8 + d571a08 commit 08f5813
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Carbon.Core/Carbon.Components/Carbon.Common
Submodule Carbon.Common updated 3 files
+11 −0 src/Carbon/Core/Core.Auto.Impl.cs
+21 −1 src/Carbon/Core/Core.Auto.cs
+1 −1 src/Carbon/Modules/AdminModule/AdminModule.cs
2 changes: 1 addition & 1 deletion Carbon.Core/Carbon.Components/Carbon.Modules
Submodule Carbon.Modules updated 2 files
+0 −12 src/ModerationToolsModule/ModerationToolsModule.cs
+44 −47 src/OptimisationsModule/OptimisationsModule.cs
33 changes: 8 additions & 25 deletions Carbon.Core/Carbon.Core.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Carbon.Hooks.Community", "C
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Carbon.Hooks.Oxide", "Carbon.Hooks\Carbon.Hooks.Oxide\Carbon.Hooks.Oxide.csproj", "{3AFD9CF3-D1AB-494F-869E-698F687CBBBA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Carbon.Test", "Carbon.Components\Carbon.Test\Carbon.Test.csproj", "{6F8322EF-79DA-475B-B39C-EAC40771A46F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Carbon.Test", "Carbon.Components\Carbon.Test\Carbon.Test.csproj", "{6F8322EF-79DA-475B-B39C-EAC40771A46F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -285,30 +285,6 @@ Global
{3AFD9CF3-D1AB-494F-869E-698F687CBBBA}.ReleaseUnix|Any CPU.Build.0 = ReleaseUnix|x64
{3AFD9CF3-D1AB-494F-869E-698F687CBBBA}.ReleaseUnix|x64.ActiveCfg = ReleaseUnix|x64
{3AFD9CF3-D1AB-494F-869E-698F687CBBBA}.ReleaseUnix|x64.Build.0 = ReleaseUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Debug|Any CPU.ActiveCfg = Debug|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Debug|Any CPU.Build.0 = Debug|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Debug|x64.ActiveCfg = Debug|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Debug|x64.Build.0 = Debug|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.DebugUnix|Any CPU.ActiveCfg = DebugUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.DebugUnix|Any CPU.Build.0 = DebugUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.DebugUnix|x64.ActiveCfg = DebugUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.DebugUnix|x64.Build.0 = DebugUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Minimal|Any CPU.ActiveCfg = Minimal|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Minimal|Any CPU.Build.0 = Minimal|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Minimal|x64.ActiveCfg = Minimal|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Minimal|x64.Build.0 = Minimal|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.MinimalUnix|Any CPU.ActiveCfg = MinimalUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.MinimalUnix|Any CPU.Build.0 = MinimalUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.MinimalUnix|x64.ActiveCfg = MinimalUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.MinimalUnix|x64.Build.0 = MinimalUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Release|Any CPU.ActiveCfg = Release|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Release|Any CPU.Build.0 = Release|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Release|x64.ActiveCfg = Release|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.Release|x64.Build.0 = Release|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.ReleaseUnix|Any CPU.ActiveCfg = ReleaseUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.ReleaseUnix|Any CPU.Build.0 = ReleaseUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.ReleaseUnix|x64.ActiveCfg = ReleaseUnix|x64
{268C4DA0-D58A-42A4-A395-3089DC9BDD83}.ReleaseUnix|x64.Build.0 = ReleaseUnix|x64
{6F8322EF-79DA-475B-B39C-EAC40771A46F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F8322EF-79DA-475B-B39C-EAC40771A46F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F8322EF-79DA-475B-B39C-EAC40771A46F}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -338,9 +314,16 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{682D913A-35E8-4850-A84D-1D4916597591} = {31982314-60E6-4740-98FC-2FCDDFB5E35A}
{531A79E2-9D4E-4C69-B277-D668F515C209} = {31982314-60E6-4740-98FC-2FCDDFB5E35A}
{6F8322EF-79DA-478B-B39C-EAC40771A46F} = {31982314-60E6-4740-98FC-2FCDDFB5E35A}
{50B851B5-BF90-4856-91D7-FDB4848AC8F7} = {31982314-60E6-4740-98FC-2FCDDFB5E35A}
{30B4B72A-9E9A-422D-9FDE-98DDD677B1AE} = {31982314-60E6-4740-98FC-2FCDDFB5E35A}
{8FF370BD-7F23-4E47-8757-7197305E555D} = {31982314-60E6-4740-98FC-2FCDDFB5E35A}
{DFA7C283-46B7-43BB-B847-766C1A8FFC12} = {F89EDA47-1AE3-4F86-9F6D-578BB3E307E8}
{CD6421B4-1106-4D99-9830-C2C2201EED9C} = {F89EDA47-1AE3-4F86-9F6D-578BB3E307E8}
{3AFD9CF3-D1AB-494F-869E-698F687CBBBA} = {F89EDA47-1AE3-4F86-9F6D-578BB3E307E8}
{6F8322EF-79DA-475B-B39C-EAC40771A46F} = {31982314-60E6-4740-98FC-2FCDDFB5E35A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {28C89D3B-47B2-45D4-88D4-08EE9E94E67A}
Expand Down
2 changes: 1 addition & 1 deletion Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base
Submodule Carbon.Hooks.Base updated 1 files
+2 −3 src/Static/IOnConsoleCommand.cs

0 comments on commit 08f5813

Please sign in to comment.