From 1e86eb792f164b74e35c6102fb4d3b707765b49b Mon Sep 17 00:00:00 2001
From: Chromachine <chromagamingstaff@gmail.com>
Date: Mon, 11 Feb 2019 21:44:53 +0000
Subject: [PATCH] Renames, update

---
 ButtonChat/config.yml                 |  8 +++-----
 PermissionsEx/permissions.yml         |  5 +++++
 {ButtonCore => ThorpeCore}/config.yml | 11 ++++++++---
 update.sh                             |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)
 rename {ButtonCore => ThorpeCore}/config.yml (86%)
 mode change 100755 => 100644

diff --git a/ButtonChat/config.yml b/ButtonChat/config.yml
index fb9813f..e58c9cb 100644
--- a/ButtonChat/config.yml
+++ b/ButtonChat/config.yml
@@ -29,7 +29,6 @@ components:
       marine_city:
       - DarkGray
       britguard:
-      - DarkBlue
       - DarkRed
       iwa:
       - Aqua
@@ -45,12 +44,9 @@ components:
       forfgorne:
       - DarkGray
     nationcolors:
-      knights: DarkRed
       albion: DarkBlue
-      makani: DarkGreen
-      pressia: DarkBlue
+      pressia: Aqua
       aurora: Gold
-      alderon: DarkAqua
       expanse: Gray
   FlairComponent:
     enabled: true
@@ -59,3 +55,5 @@ components:
     enabled: true
     announceTime: 900000
     announceMessages: []
+  FunComponent:
+    enabled: true
diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml
index 6049293..48aec77 100644
--- a/PermissionsEx/permissions.yml
+++ b/PermissionsEx/permissions.yml
@@ -950,3 +950,8 @@ users:
     - member
     options:
       name: BrandynJ
+  e3775b5d-f71b-42ed-9f8e-5ac56f11a22d:
+    group:
+    - member
+    options:
+      name: Ninja_Gaiden1
diff --git a/ButtonCore/config.yml b/ThorpeCore/config.yml
old mode 100755
new mode 100644
similarity index 86%
rename from ButtonCore/config.yml
rename to ThorpeCore/config.yml
index e28998a..686a2ff
--- a/ButtonCore/config.yml
+++ b/ThorpeCore/config.yml
@@ -1,6 +1,6 @@
 test: false
 global:
-  writePluginList: false
+  writePluginList: true
 components:
   PluginUpdaterComponent:
     enabled: true
@@ -10,15 +10,18 @@ components:
     enabled: true
     g:
       enabled: true
-      IDs: []
-      displayName: §fOOC§f
+      IDs:
+      - ooc
       color: White
+      displayName: §fOOC§f
     a:
       enabled: true
       IDs: []
     mod:
       enabled: true
       IDs: []
+      color: Blue
+      displayName: §9MOD§f
     dev:
       enabled: true
       IDs: []
@@ -46,6 +49,8 @@ components:
     nc:
       enabled: true
       IDs: []
+      color: Gold
+      displayName: §6NC§f
     rp:
       enabled: true
       IDs: []
diff --git a/update.sh b/update.sh
index 77f104e..c98ac5e 100755
--- a/update.sh
+++ b/update.sh
@@ -3,7 +3,7 @@ git rm  --cached -rfq '*/*' ':!:.github/*'  # Unstage everything in folders in c
 readarray -t plugins < plugins.txt # -t removes trailing newlines
 for i in "${plugins[@]}"
 do
-	if [ -d $i -a $i != "DiscordPlugin" -a $i != "OpenInv" ]; then
+	if [ -d $i -a $i != "Thorpe-Discord" -a $i != "OpenInv" ]; then
 		find $i -name "config.yml" -exec git add -f '{}' \; # All files are ignored, need to force add
 	fi
 done