From a0b4f896e86c09e35ca2af58c9552f27198ced8e Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Mon, 2 Nov 2015 20:00:54 +1100
Subject: [PATCH] Merge mod and moderation (they were auto-generated) folders.

---
 Commands/{moderation => mod}/CmdFixGrass.cs  |  0
 Commands/{moderation => mod}/CmdHighlight.cs |  0
 Commands/{moderation => mod}/CmdLocation.cs  |  0
 Commands/{moderation => mod}/CmdTempBan.cs   |  0
 Commands/{moderation => mod}/CmdTrust.cs     |  0
 MCGalaxy_.csproj                             | 11 +++++------
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename Commands/{moderation => mod}/CmdFixGrass.cs (100%)
 rename Commands/{moderation => mod}/CmdHighlight.cs (100%)
 rename Commands/{moderation => mod}/CmdLocation.cs (100%)
 rename Commands/{moderation => mod}/CmdTempBan.cs (100%)
 rename Commands/{moderation => mod}/CmdTrust.cs (100%)

diff --git a/Commands/moderation/CmdFixGrass.cs b/Commands/mod/CmdFixGrass.cs
similarity index 100%
rename from Commands/moderation/CmdFixGrass.cs
rename to Commands/mod/CmdFixGrass.cs
diff --git a/Commands/moderation/CmdHighlight.cs b/Commands/mod/CmdHighlight.cs
similarity index 100%
rename from Commands/moderation/CmdHighlight.cs
rename to Commands/mod/CmdHighlight.cs
diff --git a/Commands/moderation/CmdLocation.cs b/Commands/mod/CmdLocation.cs
similarity index 100%
rename from Commands/moderation/CmdLocation.cs
rename to Commands/mod/CmdLocation.cs
diff --git a/Commands/moderation/CmdTempBan.cs b/Commands/mod/CmdTempBan.cs
similarity index 100%
rename from Commands/moderation/CmdTempBan.cs
rename to Commands/mod/CmdTempBan.cs
diff --git a/Commands/moderation/CmdTrust.cs b/Commands/mod/CmdTrust.cs
similarity index 100%
rename from Commands/moderation/CmdTrust.cs
rename to Commands/mod/CmdTrust.cs
diff --git a/MCGalaxy_.csproj b/MCGalaxy_.csproj
index 7d8edf1bb..3c3ffd0a4 100644
--- a/MCGalaxy_.csproj
+++ b/MCGalaxy_.csproj
@@ -222,11 +222,6 @@
     <Compile Include="Commands\info\CmdWhoip.cs" />
     <Compile Include="Commands\info\CmdWhoNick.cs" />
     <Compile Include="Commands\info\CmdWhowas.cs" />
-    <Compile Include="Commands\moderation\CmdFixGrass.cs" />
-    <Compile Include="Commands\moderation\CmdHighlight.cs" />
-    <Compile Include="Commands\moderation\CmdLocation.cs" />
-    <Compile Include="Commands\moderation\CmdTempBan.cs" />
-    <Compile Include="Commands\moderation\CmdTrust.cs" />
     <Compile Include="Commands\mod\CmdAka.cs" />
     <Compile Include="Commands\mod\CmdAlive.cs" />
     <Compile Include="Commands\mod\CmdAllowGuns.cs" />
@@ -249,11 +244,13 @@
     <Compile Include="Commands\mod\CmdEndRound.cs" />
     <Compile Include="Commands\mod\CmdExplode.cs" />
     <Compile Include="Commands\mod\CmdFetch.cs" />
+    <Compile Include="Commands\mod\CmdFixGrass.cs" />
     <Compile Include="Commands\mod\CmdFollow.cs" />
     <Compile Include="Commands\mod\CmdFreeze.cs" />
     <Compile Include="Commands\mod\CmdGcbanlistupdate.cs" />
     <Compile Include="Commands\mod\CmdHacks.cs" />
     <Compile Include="Commands\mod\CmdHide.cs" />
+    <Compile Include="Commands\mod\CmdHighlight.cs" />
     <Compile Include="Commands\mod\CmdImport.cs" />
     <Compile Include="Commands\mod\CmdJail.cs" />
     <Compile Include="Commands\mod\CmdJoker.cs" />
@@ -262,6 +259,7 @@
     <Compile Include="Commands\mod\CmdKillPhysics.cs" />
     <Compile Include="Commands\mod\CmdLimit.cs" />
     <Compile Include="Commands\mod\CmdLoad.cs" />
+    <Compile Include="Commands\mod\CmdLocation.cs" />
     <Compile Include="Commands\mod\CmdLowlag.cs" />
     <Compile Include="Commands\mod\CmdMap.cs" />
     <Compile Include="Commands\mod\CmdModerate.cs" />
@@ -296,9 +294,11 @@
     <Compile Include="Commands\mod\CmdSetRank.cs" />
     <Compile Include="Commands\mod\CmdSetspawn.cs" />
     <Compile Include="Commands\mod\CmdShutdown.cs" />
+    <Compile Include="Commands\mod\CmdTempBan.cs" />
     <Compile Include="Commands\mod\CmdTempRank.cs" />
     <Compile Include="Commands\mod\CmdTempRankInfo.cs" />
     <Compile Include="Commands\mod\CmdTempRankList.cs" />
+    <Compile Include="Commands\mod\CmdTrust.cs" />
     <Compile Include="Commands\mod\CmdUBan.cs" />
     <Compile Include="Commands\mod\CmdUnban.cs" />
     <Compile Include="Commands\mod\CmdUnbanip.cs" />
@@ -757,7 +757,6 @@
     <Folder Include="Commands\game" />
     <Folder Include="Commands\info" />
     <Folder Include="Commands\mod" />
-    <Folder Include="Commands\moderation" />
     <Folder Include="Commands\other" />
     <Folder Include="Plugins\OpenClassicEvents\" />
   </ItemGroup>