From 13da53a12f0934874ffd104d30d645e1b9e2dd03 Mon Sep 17 00:00:00 2001
From: Chromachine <chromagamingstaff@gmail.com>
Date: Tue, 4 Sep 2018 20:23:54 +0000
Subject: [PATCH] Regular config update

---
 Multiverse-Core/worlds.yml    | 110 +++++++++++++++++-----------------
 PermissionsEx/permissions.yml |  11 +++-
 2 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml
index e790238..310d635 100755
--- a/Multiverse-Core/worlds.yml
+++ b/Multiverse-Core/worlds.yml
@@ -9,7 +9,7 @@ worlds:
     scale: '1.0'
     respawnWorld: ''
     allowWeather: 'true'
-    difficulty: EASY
+    difficulty: NORMAL
     spawning:
       ==: MVSpawnSettings
       animals:
@@ -57,7 +57,7 @@ worlds:
     scale: '1.0'
     respawnWorld: ''
     allowWeather: 'true'
-    difficulty: EASY
+    difficulty: NORMAL
     spawning:
       ==: MVSpawnSettings
       animals:
@@ -95,54 +95,6 @@ worlds:
     generator: TerrainControl
     playerLimit: '-1'
     allowFlight: 'true'
-  world:
-    ==: MVWorld
-    hidden: 'false'
-    alias: world
-    color: WHITE
-    style: NORMAL
-    pvp: 'true'
-    scale: '1.0'
-    respawnWorld: ''
-    allowWeather: 'true'
-    difficulty: NORMAL
-    spawning: &id007
-      ==: MVSpawnSettings
-      animals:
-        ==: MVSpawnSubSettings
-        spawn: 'true'
-        spawnrate: '-1'
-        exceptions: []
-      monsters:
-        ==: MVSpawnSubSettings
-        spawn: 'true'
-        spawnrate: '-1'
-        exceptions: []
-    entryfee: &id008
-      ==: MVEntryFee
-      amount: '0.0'
-      currency: '-1'
-    hunger: 'true'
-    autoHeal: 'true'
-    adjustSpawn: 'false'
-    portalForm: ALL
-    gameMode: SURVIVAL
-    keepSpawnInMemory: 'false'
-    spawnLocation:
-      ==: MVSpawnLocation
-      x: 1385.2648659554345
-      y: 71.04026167783364
-      z: -32.50617928137268
-      pitch: 90.0
-      yaw: 91.80102
-    autoLoad: 'true'
-    bedRespawn: 'true'
-    worldBlacklist: &id009 []
-    environment: NORMAL
-    seed: '7008642968894271479'
-    generator: TerrainControl
-    playerLimit: '-1'
-    allowFlight: 'true'
   world_the_end:
     ==: MVWorld
     hidden: 'false'
@@ -191,6 +143,54 @@ worlds:
     generator: 'null'
     playerLimit: '-1'
     allowFlight: 'true'
+  world:
+    ==: MVWorld
+    hidden: 'false'
+    alias: world
+    color: WHITE
+    style: NORMAL
+    pvp: 'true'
+    scale: '1.0'
+    respawnWorld: ''
+    allowWeather: 'true'
+    difficulty: NORMAL
+    spawning: &id007
+      ==: MVSpawnSettings
+      animals:
+        ==: MVSpawnSubSettings
+        spawn: 'true'
+        spawnrate: '-1'
+        exceptions: []
+      monsters:
+        ==: MVSpawnSubSettings
+        spawn: 'true'
+        spawnrate: '-1'
+        exceptions: []
+    entryfee: &id008
+      ==: MVEntryFee
+      amount: '0.0'
+      currency: '-1'
+    hunger: 'true'
+    autoHeal: 'true'
+    adjustSpawn: 'false'
+    portalForm: ALL
+    gameMode: SURVIVAL
+    keepSpawnInMemory: 'false'
+    spawnLocation:
+      ==: MVSpawnLocation
+      x: 1385.2648659554345
+      y: 71.04026167783364
+      z: -32.50617928137268
+      pitch: 90.0
+      yaw: 91.80102
+    autoLoad: 'true'
+    bedRespawn: 'true'
+    worldBlacklist: &id009 []
+    environment: NORMAL
+    seed: '7008642968894271479'
+    generator: TerrainControl
+    playerLimit: '-1'
+    allowFlight: 'true'
   test:
     ==: MVWorld
     hidden: 'false'
@@ -201,7 +201,7 @@ worlds:
     scale: '1.0'
     respawnWorld: ''
     allowWeather: 'true'
-    difficulty: EASY
+    difficulty: NORMAL
     spawning:
       ==: MVSpawnSettings
       animals:
@@ -297,7 +297,7 @@ worlds:
     scale: '1.0'
     respawnWorld: ''
     allowWeather: 'false'
-    difficulty: PEACEFUL
+    difficulty: NORMAL
     spawning:
       ==: MVSpawnSettings
       animals:
@@ -345,7 +345,7 @@ worlds:
     scale: '1.0'
     respawnWorld: ''
     allowWeather: 'false'
-    difficulty: EASY
+    difficulty: NORMAL
     spawning:
       ==: MVSpawnSettings
       animals:
@@ -393,7 +393,7 @@ worlds:
     scale: '1.0'
     respawnWorld: ''
     allowWeather: 'true'
-    difficulty: EASY
+    difficulty: NORMAL
     spawning:
       ==: MVSpawnSettings
       animals:
@@ -441,7 +441,7 @@ worlds:
     scale: '1.0'
     respawnWorld: ''
     allowWeather: 'true'
-    difficulty: EASY
+    difficulty: NORMAL
     spawning: *id007
     entryfee: *id008
     hunger: 'true'
diff --git a/PermissionsEx/permissions.yml b/PermissionsEx/permissions.yml
index a4858f9..9e4df10 100644
--- a/PermissionsEx/permissions.yml
+++ b/PermissionsEx/permissions.yml
@@ -135,6 +135,7 @@ groups:
     - donator
     - developer
     permissions:
+    - libsdisguises.*
     - plots.admin
     - ChestShop.admin
     - fawe.plotsquared.admin
@@ -245,6 +246,7 @@ users:
     - builder
     - trusted
     - member
+    permissions: []
   69e63e10-e0a6-4cb0-b519-b0e8f57cc7c9:
     options:
       name: Ghostise
@@ -299,7 +301,7 @@ users:
     - member
   423ab9b6-5518-4fa2-afc3-31143f169a75:
     options:
-      name: Heisenbirdd
+      name: jaydotexe
     group:
     - gold
     - member
@@ -473,6 +475,8 @@ users:
     - member
     options:
       name: LadyVulcanOne
+    permissions:
+    - pex.*
   cb93383c-d72b-4605-bdd2-c9c0b44e2b30:
     group:
     - member
@@ -749,3 +753,8 @@ users:
     worlds:
       gold:
         permissions: []
+  0097b618-d8f7-48b5-82d7-172ae17fbd5b:
+    group:
+    - member
+    options:
+      name: SlackerPlays