From 71d6fc618840fb3623f42e77a818faa4b14c5816 Mon Sep 17 00:00:00 2001
From: Chromachine <chromachine>
Date: Sun, 24 Jun 2018 18:18:58 +0000
Subject: [PATCH] Rebase pull for 'download'

---
 Multiverse-Core/worlds.yml | 96 +++++++++++++++++++-------------------
 download.sh                |  2 +-
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/Multiverse-Core/worlds.yml b/Multiverse-Core/worlds.yml
index 5849993..dba7abf 100755
--- a/Multiverse-Core/worlds.yml
+++ b/Multiverse-Core/worlds.yml
@@ -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: EASY
-    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: EASY
+    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'
diff --git a/download.sh b/download.sh
index 612c511..bf18b4d 100755
--- a/download.sh
+++ b/download.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-git pull
+git pull --rebase