diff --git a/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json b/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json
index 97406d7..731ae11 100644
--- a/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json
+++ b/EstiNet/advancements/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json
@@ -1,7 +1,13 @@
 {
   "minecraft:recipes/transportation/acacia_boat": {
     "criteria": {
-      "entered_water": "2018-02-10 12:30:47 -0500"
+      "in_water": "2018-10-27 20:39:45 -0400"
+    },
+    "done": true
+  },
+  "minecraft:recipes/transportation/oak_boat": {
+    "criteria": {
+      "in_water": "2018-10-27 20:39:45 -0400"
     },
     "done": true
   },
@@ -13,37 +19,37 @@
   },
   "minecraft:recipes/transportation/dark_oak_boat": {
     "criteria": {
-      "entered_water": "2018-02-10 12:30:47 -0500"
+      "in_water": "2018-10-27 20:39:45 -0400"
     },
     "done": true
   },
   "minecraft:recipes/transportation/birch_boat": {
     "criteria": {
-      "entered_water": "2018-02-10 12:30:47 -0500"
+      "in_water": "2018-10-27 20:39:45 -0400"
     },
     "done": true
   },
-  "minecraft:recipes/transportation/boat": {
+  "minecraft:recipes/transportation/jungle_boat": {
     "criteria": {
-      "entered_water": "2018-02-10 12:30:47 -0500"
+      "in_water": "2018-10-27 20:39:45 -0400"
     },
     "done": true
   },
-  "minecraft:recipes/transportation/jungle_boat": {
+  "minecraft:recipes/transportation/spruce_boat": {
     "criteria": {
-      "entered_water": "2018-02-10 12:30:47 -0500"
+      "in_water": "2018-10-27 20:39:45 -0400"
     },
     "done": true
   },
-  "minecraft:recipes/transportation/spruce_boat": {
+  "minecraft:recipes/misc/iron_nugget_from_smelting": {
     "criteria": {
-      "entered_water": "2018-02-10 12:30:47 -0500"
+      "has_iron_axe": "2018-10-27 20:44:03 -0400"
     },
     "done": true
   },
   "minecraft:adventure/adventuring_time": {
     "criteria": {
-      "plains": "2018-02-10 12:23:42 -0500"
+      "minecraft:plains": "2018-02-10 12:23:42 -0500"
     },
     "done": false
   }
diff --git a/EstiNet/data/EndCity_index.dat b/EstiNet/data/EndCity_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/EstiNet/data/EndCity_index.dat differ
diff --git a/EstiNet/data/Fortress_index.dat b/EstiNet/data/Fortress_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/EstiNet/data/Fortress_index.dat differ
diff --git a/EstiNet/data/Mansion_index.dat b/EstiNet/data/Mansion_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/EstiNet/data/Mansion_index.dat differ
diff --git a/EstiNet/data/Mineshaft_index.dat b/EstiNet/data/Mineshaft_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/EstiNet/data/Mineshaft_index.dat differ
diff --git a/EstiNet/data/Monument_index.dat b/EstiNet/data/Monument_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/EstiNet/data/Monument_index.dat differ
diff --git a/EstiNet/data/Stronghold_index.dat b/EstiNet/data/Stronghold_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/EstiNet/data/Stronghold_index.dat differ
diff --git a/EstiNet/data/Temple_index.dat b/EstiNet/data/Temple_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/EstiNet/data/Temple_index.dat differ
diff --git a/EstiNet/data/Village_index.dat b/EstiNet/data/Village_index.dat
new file mode 100644
index 0000000..76fc935
Binary files /dev/null and b/EstiNet/data/Village_index.dat differ
diff --git a/EstiNet/data/scoreboard.dat b/EstiNet/data/scoreboard.dat
index 9c3340b..547231f 100644
Binary files a/EstiNet/data/scoreboard.dat and b/EstiNet/data/scoreboard.dat differ
diff --git a/EstiNet/data/villages.dat b/EstiNet/data/villages.dat
index dabb761..7050ff4 100644
Binary files a/EstiNet/data/villages.dat and b/EstiNet/data/villages.dat differ
diff --git a/EstiNet/datapacks/bukkit/pack.mcmeta b/EstiNet/datapacks/bukkit/pack.mcmeta
new file mode 100644
index 0000000..76afe9d
--- /dev/null
+++ b/EstiNet/datapacks/bukkit/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "Data pack for resources provided by Bukkit plugins",
+        "pack_format": 1
+    }
+}
\ No newline at end of file
diff --git a/EstiNet/level.dat b/EstiNet/level.dat
index 3d26147..777afc4 100644
Binary files a/EstiNet/level.dat and b/EstiNet/level.dat differ
diff --git a/EstiNet/level.dat_old b/EstiNet/level.dat_old
index 5cd29bd..c878f3f 100644
Binary files a/EstiNet/level.dat_old and b/EstiNet/level.dat_old differ
diff --git a/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat b/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat
index 06e33e6..4b7dd2c 100644
Binary files a/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat and b/EstiNet/playerdata/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.dat differ
diff --git a/EstiNet/region/r.-1.-1.mca b/EstiNet/region/r.-1.-1.mca
index 448a9bd..b2bbe54 100644
Binary files a/EstiNet/region/r.-1.-1.mca and b/EstiNet/region/r.-1.-1.mca differ
diff --git a/EstiNet/region/r.-1.0.mca b/EstiNet/region/r.-1.0.mca
index 769e3b9..4c4e2b3 100644
Binary files a/EstiNet/region/r.-1.0.mca and b/EstiNet/region/r.-1.0.mca differ
diff --git a/EstiNet/region/r.-1.1.mca b/EstiNet/region/r.-1.1.mca
index a4bea1c..de71c55 100644
Binary files a/EstiNet/region/r.-1.1.mca and b/EstiNet/region/r.-1.1.mca differ
diff --git a/EstiNet/region/r.-1.2.mca b/EstiNet/region/r.-1.2.mca
index 6a02924..cd3f051 100644
Binary files a/EstiNet/region/r.-1.2.mca and b/EstiNet/region/r.-1.2.mca differ
diff --git a/EstiNet/region/r.-2.-1.mca b/EstiNet/region/r.-2.-1.mca
index 893878a..f51fca5 100644
Binary files a/EstiNet/region/r.-2.-1.mca and b/EstiNet/region/r.-2.-1.mca differ
diff --git a/EstiNet/region/r.-2.0.mca b/EstiNet/region/r.-2.0.mca
index 0ea09a1..fbae1b5 100644
Binary files a/EstiNet/region/r.-2.0.mca and b/EstiNet/region/r.-2.0.mca differ
diff --git a/EstiNet/region/r.-2.1.mca b/EstiNet/region/r.-2.1.mca
index 54e949e..f284672 100644
Binary files a/EstiNet/region/r.-2.1.mca and b/EstiNet/region/r.-2.1.mca differ
diff --git a/EstiNet/region/r.-2.2.mca b/EstiNet/region/r.-2.2.mca
index fbd1ea9..a5d898f 100644
Binary files a/EstiNet/region/r.-2.2.mca and b/EstiNet/region/r.-2.2.mca differ
diff --git a/EstiNet/region/r.-4.14.mca b/EstiNet/region/r.-4.14.mca
new file mode 100644
index 0000000..5672c99
Binary files /dev/null and b/EstiNet/region/r.-4.14.mca differ
diff --git a/EstiNet/region/r.-4.15.mca b/EstiNet/region/r.-4.15.mca
new file mode 100644
index 0000000..74bf508
Binary files /dev/null and b/EstiNet/region/r.-4.15.mca differ
diff --git a/EstiNet/region/r.-5.14.mca b/EstiNet/region/r.-5.14.mca
new file mode 100644
index 0000000..6661240
Binary files /dev/null and b/EstiNet/region/r.-5.14.mca differ
diff --git a/EstiNet/region/r.-5.15.mca b/EstiNet/region/r.-5.15.mca
new file mode 100644
index 0000000..ed3fc3c
Binary files /dev/null and b/EstiNet/region/r.-5.15.mca differ
diff --git a/EstiNet/region/r.0.-1.mca b/EstiNet/region/r.0.-1.mca
index 037d637..92d1797 100644
Binary files a/EstiNet/region/r.0.-1.mca and b/EstiNet/region/r.0.-1.mca differ
diff --git a/EstiNet/region/r.0.0.mca b/EstiNet/region/r.0.0.mca
index e819614..91f2cf5 100644
Binary files a/EstiNet/region/r.0.0.mca and b/EstiNet/region/r.0.0.mca differ
diff --git a/EstiNet/region/r.0.1.mca b/EstiNet/region/r.0.1.mca
index 310bfbe..11636a5 100644
Binary files a/EstiNet/region/r.0.1.mca and b/EstiNet/region/r.0.1.mca differ
diff --git a/EstiNet/region/r.0.2.mca b/EstiNet/region/r.0.2.mca
index 1958452..1b54541 100644
Binary files a/EstiNet/region/r.0.2.mca and b/EstiNet/region/r.0.2.mca differ
diff --git a/EstiNet/region/r.1.-1.mca b/EstiNet/region/r.1.-1.mca
index 7cf93b2..2cc1f97 100644
Binary files a/EstiNet/region/r.1.-1.mca and b/EstiNet/region/r.1.-1.mca differ
diff --git a/EstiNet/region/r.1.0.mca b/EstiNet/region/r.1.0.mca
index a2ec188..f2024f9 100644
Binary files a/EstiNet/region/r.1.0.mca and b/EstiNet/region/r.1.0.mca differ
diff --git a/EstiNet/region/r.1.1.mca b/EstiNet/region/r.1.1.mca
index 8d132fc..ced5664 100644
Binary files a/EstiNet/region/r.1.1.mca and b/EstiNet/region/r.1.1.mca differ
diff --git a/EstiNet/region/r.1.2.mca b/EstiNet/region/r.1.2.mca
index a70960c..a5050b6 100644
Binary files a/EstiNet/region/r.1.2.mca and b/EstiNet/region/r.1.2.mca differ
diff --git a/EstiNet/region/r.2.0.mca b/EstiNet/region/r.2.0.mca
index 38cc242..4eefda8 100644
Binary files a/EstiNet/region/r.2.0.mca and b/EstiNet/region/r.2.0.mca differ
diff --git a/EstiNet/region/r.2.1.mca b/EstiNet/region/r.2.1.mca
index 462db82..e3d0955 100644
Binary files a/EstiNet/region/r.2.1.mca and b/EstiNet/region/r.2.1.mca differ
diff --git a/EstiNet/session.lock b/EstiNet/session.lock
index fe62913..354b462 100644
Binary files a/EstiNet/session.lock and b/EstiNet/session.lock differ
diff --git a/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json b/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json
index 62f9c8a..2dc66a6 100644
--- a/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json
+++ b/EstiNet/stats/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.json
@@ -1 +1 @@
-{"stat.walkOneCm":29018,"stat.leaveGame":6,"stat.flyOneCm":874044,"stat.jump":141,"stat.swimOneCm":2358,"stat.playOneMinute":47077,"stat.sneakTime":3745,"stat.crouchOneCm":9818,"stat.timeSinceDeath":47077,"stat.sprintOneCm":30925,"stat.diveOneCm":1520}
\ No newline at end of file
+{"stats":{"minecraft:custom":{"minecraft:jump":215,"minecraft:time_since_rest":17016,"minecraft:play_one_minute":64093,"minecraft:crouch_one_cm":11319,"minecraft:leave_game":8,"minecraft:sprint_one_cm":42612,"minecraft:time_since_death":64093,"minecraft:walk_on_water_one_cm":3813,"minecraft:walk_one_cm":35944,"minecraft:sneak_time":4388,"minecraft:walk_under_water_one_cm":5787,"minecraft:swim_one_cm":2528,"minecraft:fly_one_cm":1125120}},"DataVersion":1631}
\ No newline at end of file
diff --git a/bukkit.yml b/bukkit.yml
index cf1f598..d998fd7 100644
--- a/bukkit.yml
+++ b/bukkit.yml
@@ -1,15 +1,15 @@
 # This is the main configuration file for Bukkit.
 # As you can see, there's actually not that much to configure without any plugins.
 # For a reference for any variable inside this file, check out the Bukkit Wiki at
-# http://wiki.bukkit.org/Bukkit.yml
+# https://www.spigotmc.org/go/bukkit-yml
 # 
 # If you need help on this file, feel free to join us on irc or leave a message
 # on the forums asking for advice.
 # 
 # IRC: #spigot @ irc.spi.gt
-#    (If this means nothing to you, just go to http://www.spigotmc.org/pages/irc/ )
-# Forums: http://www.spigotmc.org/
-# Bug tracker: http://www.spigotmc.org/go/bugs
+#    (If this means nothing to you, just go to https://www.spigotmc.org/go/irc )
+# Forums: https://www.spigotmc.org/
+# Bug tracker: https://www.spigotmc.org/go/bugs
 
 
 settings:
diff --git a/commands.yml b/commands.yml
index 17a0ac7..2005481 100644
--- a/commands.yml
+++ b/commands.yml
@@ -1,17 +1,18 @@
 # This is the commands configuration file for Bukkit.
 # For documentation on how to make use of this file, check out the Bukkit Wiki at
-# http://wiki.bukkit.org/Commands.yml
+# https://www.spigotmc.org/go/commands-yml
 # 
 # If you need help on this file, feel free to join us on irc or leave a message
 # on the forums asking for advice.
 # 
 # IRC: #spigot @ irc.spi.gt
-#    (If this means nothing to you, just go to http://www.spigotmc.org/pages/irc/ )
-# Forums: http://www.spigotmc.org/
-# Bug tracker: http://www.spigotmc.org/go/bugs
+#    (If this means nothing to you, just go to https://www.spigotmc.org/go/irc )
+# Forums: https://www.spigotmc.org/
+# Bug tracker: https://www.spigotmc.org/go/bugs
 
 command-block-overrides: []
-unrestricted-advancements: false
+ignore-vanilla-permissions: false
 aliases:
   icanhasbukkit:
   - version $1-
+unrestricted-advancements: false
diff --git a/minecraft_server.jar b/minecraft_server.jar
index f167909..e125b2b 100644
Binary files a/minecraft_server.jar and b/minecraft_server.jar differ
diff --git a/ops.json b/ops.json
index 84bba3b..fa31dd9 100644
--- a/ops.json
+++ b/ops.json
@@ -1,25 +1,25 @@
 [
   {
-    "uuid": "20ae9880-b524-42c9-a8c5-fcbf6a8c484a",
-    "name": "Over1ord_Ray",
+    "uuid": "4ad26a62-db2a-3ff7-a9b2-83ff8441e443",
+    "name": "EspiDev",
     "level": 4,
     "bypassesPlayerLimit": false
   },
   {
-    "uuid": "ade21d41-274e-4cd0-a251-03cf67642e4e",
-    "name": "nap14hockey",
+    "uuid": "b48083c2-19ca-4959-a0d0-a967a93d0fd3",
+    "name": "Seshpenguin",
     "level": 4,
     "bypassesPlayerLimit": false
   },
   {
-    "uuid": "4ad26a62-db2a-3ff7-a9b2-83ff8441e443",
-    "name": "EspiDev",
+    "uuid": "20ae9880-b524-42c9-a8c5-fcbf6a8c484a",
+    "name": "Over1ord_Ray",
     "level": 4,
     "bypassesPlayerLimit": false
   },
   {
-    "uuid": "b48083c2-19ca-4959-a0d0-a967a93d0fd3",
-    "name": "Seshpenguin",
+    "uuid": "ade21d41-274e-4cd0-a251-03cf67642e4e",
+    "name": "nap14hockey",
     "level": 4,
     "bypassesPlayerLimit": false
   },
diff --git a/paper.yml b/paper.yml
index 1f37f30..31f0a80 100644
--- a/paper.yml
+++ b/paper.yml
@@ -3,32 +3,54 @@
 # with caution, and make sure you know what each option does before configuring.
 # 
 # If you need help with the configuration or have any questions related to Paper,
-# join us in our IRC channel.
+# join us in our Discord or IRC channel.
 # 
+# Discord: https://paperdiscord.emc.gs
 # IRC: #paper @ irc.spi.gt ( http://irc.spi.gt/iris/?channels=paper )
-# Wiki: https://paper.readthedocs.org/ 
-# Paper Forums: https://aquifermc.org/ 
+# Website: https://papermc.io/ 
+# Docs: https://paper.readthedocs.org/ 
 
 verbose: false
-config-version: 13
+config-version: 15
 settings:
   load-permissions-yml-before-plugins: true
   bungee-online-mode: true
-  suggest-player-names-when-null-tab-completions: true
+  save-player-data: true
   sleep-between-chunk-saves: false
   region-file-cache-size: 256
   save-empty-scoreboard-teams: false
   incoming-packet-spam-threshold: 300
   remove-invalid-statistics: false
-  min-chunk-load-threads: 2
+  use-versioned-world: false
+  velocity-support:
+    enabled: false
+    online-mode: false
+    secret: ''
+  queue-light-updates-max-loss: 10
+  suggest-player-names-when-null-tab-completions: true
+  watchdog:
+    early-warning-every: 5000
+    early-warning-delay: 10000
+  spam-limiter:
+    tab-spam-increment: 1
+    tab-spam-limit: 500
   enable-player-collisions: false
   player-auto-save-rate: -1
+  max-player-auto-save-per-tick: -1
+  async-chunks:
+    enable: true
+    generation: true
+    thread-per-world-generation: true
+    load-threads: -1
+  use-alternative-luck-formula: false
+  min-chunk-load-threads: 2
   set-health-before-death-event: false
 messages:
   kick:
+    authentication-servers-down: ''
+    connection-throttle: Connection throttled! Please wait before reconnecting.
     flying-player: Flying is not enabled on this server
     flying-vehicle: Flying is not enabled on this server
-    authentication-servers-down: ''
 timings:
   enabled: true
   verbose: true
@@ -40,47 +62,49 @@ timings:
   history-length: 3600
 world-settings:
   default:
-    generator-settings:
-      canyon: true
-      caves: true
-      dungeon: true
-      fortress: true
-      mineshaft: true
-      monument: true
-      stronghold: true
-      temple: true
-      village: true
-      flat-bedrock: false
-    remove-corrupt-tile-entities: false
     use-chunk-inhabited-timer: true
-    portal-search-radius: 128
     queue-light-updates: false
     optimize-explosions: false
     use-vanilla-world-scoreboard-name-coloring: false
     delay-chunk-unloads-by: 10s
     max-auto-save-chunks-per-tick: 24
     save-queue-limit-for-auto-save: 50
-    squid-spawn-height:
-      minimum: 45.0
-      maximum: 63.0
+    remove-corrupt-tile-entities: false
+    enable-treasure-maps: true
+    treasure-maps-return-already-discovered: false
+    max-chunk-sends-per-tick: 81
+    max-chunk-gens-per-tick: 10
+    game-mechanics:
+      scan-for-legacy-ender-dragon: true
+      villages-load-chunks: false
+      disable-chest-cat-detection: false
+      disable-end-credits: false
+      disable-player-crits: false
+      disable-sprint-interruption-on-attack: false
+      shield-blocking-delay: 5
+      disable-unloaded-chunk-enderpearl-exploit: true
+    prevent-moving-into-unloaded-chunks: false
     max-growth-height:
       cactus: 3
       reeds: 3
     fishing-time-range:
       MinimumTicks: 100
       MaximumTicks: 600
+    portal-search-radius: 128
     despawn-ranges:
       soft: 32
       hard: 128
     falling-block-height-nerf: 0
     tnt-entity-height-nerf: 0
-    water-over-lava-flow-speed: 5
-    fast-drain:
-      lava: false
-      water: false
-    lava-flow-speed:
-      normal: 30
-      nether: 10
+    lightning-strike-distance-limit:
+      sound: -1
+      impact-sound: -1
+      flash: -1
+    frosted-ice:
+      enabled: true
+      delay:
+        min: 20
+        max: 40
     lootables:
       auto-replenish: false
       restrict-player-reloot: true
@@ -91,33 +115,20 @@ world-settings:
     filter-nbt-data-from-spawn-eggs-and-related: true
     max-entity-collisions: 8
     disable-creeper-lingering-effect: false
-    keep-spawn-loaded-range: 8
-    auto-save-interval: -1
-    nether-ceiling-void-damage: false
-    allow-non-player-entities-on-scoreboards: false
-    frosted-ice:
-      enabled: true
-      delay:
-        min: 20
-        max: 40
     hopper:
+      cooldown-when-full: true
+      disable-move-event: false
       push-based: false
-    disable-explosion-knockback: false
-    parrots-are-unaffected-by-player-movement: false
-    elytra-hit-wall-damage: true
-    grass-spread-tick-rate: 1
-    game-mechanics:
-      disable-chest-cat-detection: false
-      disable-end-credits: false
-    use-alternate-fallingblock-onGround-detection: false
-    non-player-arrow-despawn-rate: -1
-    prevent-tnt-from-moving-in-water: false
+    duplicate-uuid-resolver: saferegen
+    duplicate-uuid-saferegen-delete-range: 32
+    keep-spawn-loaded-range: 8
     keep-spawn-loaded: true
     anti-xray:
       enabled: false
       engine-mode: 1
       chunk-edge-mode: 1
       max-chunk-section-index: 3
+      update-radius: 2
       hidden-blocks:
       - gold_ore
       - iron_ore
@@ -136,19 +147,52 @@ world-settings:
       - stone
       - planks
     experience-merge-max-value: -1
+    skip-entity-ticking-in-chunks-scheduled-for-unload: true
     armor-stands-do-collision-entity-lookups: true
-    spawner-nerfed-mobs-should-jump: false
+    auto-save-interval: -1
     disable-thunder: false
     skeleton-horse-thunder-spawn-chance: 0.01
     disable-ice-and-snow: false
     fire-physics-event-for-redstone: false
+    grass-spread-tick-rate: 1
+    water-over-lava-flow-speed: 5
+    bed-search-radius: 1
+    nether-ceiling-void-damage: false
+    allow-non-player-entities-on-scoreboards: false
+    container-update-tick-rate: 1
+    prevent-tnt-from-moving-in-water: false
+    parrots-are-unaffected-by-player-movement: false
+    non-player-arrow-despawn-rate: -1
+    creative-arrow-despawn-rate: -1
+    disable-explosion-knockback: false
+    armor-stands-tick: true
+    spawner-nerfed-mobs-should-jump: false
     baby-zombie-movement-speed: 0.5
     allow-leashing-undead-horse: false
     all-chunks-are-slime-chunks: false
     mob-spawner-tick-rate: 1
-    container-update-tick-rate: 1
+    squid-spawn-height:
+      maximum: 63.0
+      minimum: 45.0
     disable-teleportation-suffocation-check: false
-    enable-treasure-maps: true
-    treasure-maps-return-already-discovered: false
+    generator-settings:
+      canyon: true
+      caves: true
+      dungeon: true
+      fortress: true
+      mineshaft: true
+      monument: true
+      stronghold: true
+      temple: true
+      village: true
+      flat-bedrock: false
+    fast-drain:
+      lava: false
+      water: false
+    lava-flow-speed:
+      normal: 30
+      nether: 10
+    elytra-hit-wall-damage: true
+    use-alternate-fallingblock-onGround-detection: false
     enable-old-tnt-cannon-behaviors: false
     verbose: false
diff --git a/plugins/Advanced-Portals.jar b/plugins/Advanced-Portals.jar
index d019d9a..c1f9e83 100644
Binary files a/plugins/Advanced-Portals.jar and b/plugins/Advanced-Portals.jar differ
diff --git a/plugins/AdvancedPortals/portals.yml b/plugins/AdvancedPortals/portals.yml
index 9d6cd54..fa2454f 100644
--- a/plugins/AdvancedPortals/portals.yml
+++ b/plugins/AdvancedPortals/portals.yml
@@ -20,7 +20,7 @@
 
 Factions:
   world: EstiNet
-  triggerblock: STATIONARY_WATER
+  triggerblock: WATER
   bungee: factions
   pos1:
     X: -89
@@ -32,7 +32,7 @@ Factions:
     Z: 483
 Survival:
   world: EstiNet
-  triggerblock: STATIONARY_WATER
+  triggerblock: WATER
   pos1:
     X: -159
     Y: 109
@@ -46,7 +46,7 @@ Survival:
       '1': survival
 Skyblock:
   world: EstiNet
-  triggerblock: STATIONARY_WATER
+  triggerblock: WATER
   bungee: skyblock
   pos1:
     X: -149
@@ -58,7 +58,7 @@ Skyblock:
     Z: 457
 MinigameHub:
   world: EstiNet
-  triggerblock: STATIONARY_WATER
+  triggerblock: WATER
   bungee: minigamehub
   pos1:
     X: -122
@@ -70,7 +70,7 @@ MinigameHub:
     Z: 450
 Creative:
   world: EstiNet
-  triggerblock: STATIONARY_WATER
+  triggerblock: WATER
   bungee: creative
   pos1:
     X: -122
@@ -82,7 +82,7 @@ Creative:
     Z: 520
 gWars:
   world: EstiNet
-  triggerblock: STATIONARY_WATER
+  triggerblock: WATER
   bungee: gwars
   pos1:
     X: -149
@@ -92,3 +92,15 @@ gWars:
     X: -152
     Y: 100
     Z: 510
+SkyAdventures:
+  world: EstiNet
+  triggerblock: WATER
+  bungee: SkyAdventures
+  pos1:
+    X: -96
+    Y: 104
+    Z: 460
+  pos2:
+    X: -99
+    Y: 100
+    Z: 457
diff --git a/plugins/CrackShot.jar b/plugins/CrackShot.jar
deleted file mode 100644
index a930b43..0000000
Binary files a/plugins/CrackShot.jar and /dev/null differ
diff --git a/plugins/HolographicDisplays.jar b/plugins/HolographicDisplays.jar
index 500119a..8ba5606 100644
Binary files a/plugins/HolographicDisplays.jar and b/plugins/HolographicDisplays.jar differ
diff --git a/plugins/HolographicDisplays/config.yml b/plugins/HolographicDisplays/config.yml
index f687d86..cb009a1 100644
--- a/plugins/HolographicDisplays/config.yml
+++ b/plugins/HolographicDisplays/config.yml
@@ -29,3 +29,4 @@ time:
   zone: GMT+1
 update-notification: true
 debug: false
+precise-hologram-movement: true
diff --git a/plugins/HolographicDisplays/database.yml b/plugins/HolographicDisplays/database.yml
index 7891108..40c9106 100644
--- a/plugins/HolographicDisplays/database.yml
+++ b/plugins/HolographicDisplays/database.yml
@@ -63,3 +63,11 @@ survivalsign:
   location: EstiNet, -21.454, 191.200, -62.429
   lines:
   - '&lWant to try out Survival 2.0? Use "&a/survival&r"!'
+skyfactory:
+  location: EstiNet, -99.453, 101.200, 461.398
+  lines:
+  - '&5&lSky Adventures (Modded)'
+skyfactory2:
+  location: EstiNet, -118.522, 112.000, 480.530
+  lines:
+  - '&5&lSky Adventures (Modded)'
diff --git a/plugins/WorldEdit.jar b/plugins/WorldEdit.jar
index 9411332..dd3167f 100644
Binary files a/plugins/WorldEdit.jar and b/plugins/WorldEdit.jar differ
diff --git a/plugins/gFeatures.jar b/plugins/gFeatures.jar
index bdee6f8..e8025ca 100644
Binary files a/plugins/gFeatures.jar and b/plugins/gFeatures.jar differ
diff --git a/plugins/gFeatures/Players/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.yml b/plugins/gFeatures/Players/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.yml
new file mode 100644
index 0000000..c4d5580
--- /dev/null
+++ b/plugins/gFeatures/Players/4ad26a62-db2a-3ff7-a9b2-83ff8441e443.yml
@@ -0,0 +1,5 @@
+Config:
+  Name: EspiDev
+  UUID: 4ad26a62-db2a-3ff7-a9b2-83ff8441e443
+  Settings: MemorySection[path='Config.Settings', root='YamlConfiguration']
+  Setup: DO NOT REMOVE!
diff --git a/plugins/gFeatures/gRanks/config.yml b/plugins/gFeatures/gRanks/config.yml
index 95df538..b5631e2 100644
--- a/plugins/gFeatures/gRanks/config.yml
+++ b/plugins/gFeatures/gRanks/config.yml
@@ -7,3 +7,4 @@ Config:
     Password: EstiNetwork?123
   ClioteSky:
     Enable: true
+  Cached: 'true'
diff --git a/server.properties b/server.properties
index 8465a08..f9be298 100644
--- a/server.properties
+++ b/server.properties
@@ -1,8 +1,9 @@
 #Minecraft server properties
-#Sat Feb 10 12:29:50 EST 2018
+#Sat Oct 27 20:53:33 EDT 2018
 generator-settings=
 force-gamemode=false
 allow-nether=false
+enforce-whitelist=false
 gamemode=0
 broadcast-console-to-ops=true
 enable-query=false
@@ -19,6 +20,7 @@ max-players=300
 network-compression-threshold=256
 resource-pack-sha1=
 max-world-size=29999984
+server-port=25565
 debug=false
 server-ip=
 spawn-npcs=false
@@ -34,5 +36,5 @@ max-build-height=256
 level-seed=
 prevent-proxy-connections=false
 use-native-transport=true
-motd=EstiNet
 enable-rcon=false
+motd=EstiNet
diff --git a/spigot.yml b/spigot.yml
index 9b343e3..3ab5c8c 100644
--- a/spigot.yml
+++ b/spigot.yml
@@ -13,19 +13,16 @@
 config-version: 11
 settings:
   save-user-cache-on-stop-only: false
+  sample-count: 12
+  timeout-time: 60
+  restart-on-crash: false
+  restart-script: ./start.bat
   bungeecord: true
   late-bind: false
-  sample-count: 12
   player-shuffle: 0
-  filter-creative-items: true
   user-cache-size: 1000
-  int-cache-limit: 1024
   moved-wrongly-threshold: 0.0625
   moved-too-quickly-multiplier: 10.0
-  item-dirty-ticks: 20
-  timeout-time: 60
-  restart-on-crash: false
-  restart-script: ./start.bat
   netty-threads: 4
   attribute:
     maxHealth:
@@ -35,9 +32,23 @@ settings:
     attackDamage:
       max: 2048.0
   debug: false
+  filter-creative-items: true
+  int-cache-limit: 1024
+  item-dirty-ticks: 20
   moved-too-quickly-threshold: 100.0
+messages:
+  whitelist: '[&6&lEsti&3&lNet&r]&7You aren''t whitelisted.'
+  unknown-command: '[&6&lEsti&3&lNet&r] &7Unknown command.'
+  server-full: '[&6&lEsti&3&lNet&r]&7Server is full.'
+  outdated-client: '[&6&lEsti&3&lNet&r]&7Outdated client! Please use {0}'
+  outdated-server: '[&6&lEsti&3&lNet&r]&7Outdated server! I''m still on {0}'
+  restart: '[&6&lEsti&3&lNet&r]&7Restart incoming...'
+stats:
+  disable-saving: false
+  forced-stats: {}
 commands:
   tab-complete: 0
+  send-namespaced: true
   log: true
   spam-exclusions:
   - /skill
@@ -47,20 +58,10 @@ commands:
   - summon
   - testforblock
   - tellraw
-messages:
-  whitelist: '[&6&lEsti&3&lNet&r]&7You aren''t whitelisted.'
-  unknown-command: '[&6&lEsti&3&lNet&r] &7Unknown command.'
-  server-full: '[&6&lEsti&3&lNet&r]&7Server is full.'
-  outdated-client: '[&6&lEsti&3&lNet&r]&7Outdated client! Please use {0}'
-  outdated-server: '[&6&lEsti&3&lNet&r]&7Outdated server! I''m still on {0}'
-  restart: '[&6&lEsti&3&lNet&r]&7Restart incoming...'
 advancements:
   disable-saving: false
   disabled:
   - minecraft:story/disabled
-stats:
-  disable-saving: false
-  forced-stats: {}
 world-settings:
   default:
     verbose: true
@@ -79,22 +80,28 @@ world-settings:
       animals: 0
       monsters: 0
       misc: 16
+      water: 16
+      tick-inactive-villagers: true
     entity-tracking-range:
       players: 48
       animals: 48
       monsters: 48
       misc: 32
       other: 64
-    mob-spawn-range: 0
     ticks-per:
       hopper-transfer: 0
       hopper-check: 1
     hopper-amount: 0
-    save-structure-info: true
+    random-light-updates: false
     dragon-death-sound-radius: 0
     seed-village: 10387312
-    seed-feature: 14357617
+    seed-desert: 14357617
+    seed-igloo: 14357618
+    seed-jungle: 14357619
+    seed-swamp: 14357620
     seed-monument: 10387313
+    seed-shipwreck: 165745295
+    seed-ocean: 14357621
     seed-slime: 987234911
     hunger:
       jump-walk-exhaustion: 0.05
@@ -108,18 +115,22 @@ world-settings:
     max-tick-time:
       tile: 50
       entity: 50
-    item-despawn-rate: 6000
+    squid-spawn-range:
+      min: 45.0
+    mob-spawn-range: 0
     merge-radius:
-      item: 2.5
       exp: 3.0
-    arrow-despawn-rate: 1200
+      item: 2.5
     enable-zombie-pigmen-portal-spawns: false
-    wither-spawn-sound-radius: 0
+    item-despawn-rate: 6000
     view-distance: 10
+    arrow-despawn-rate: 1200
+    wither-spawn-sound-radius: 0
     hanging-tick-frequency: 100
     zombie-aggressive-towards-villager: false
     nerf-spawner-mobs: false
-    random-light-updates: false
+    save-structure-info: true
+    seed-feature: 14357617
     max-entity-collisions: 8
     chunks-per-tick: 650
     clear-tick-list: false
diff --git a/usercache.json b/usercache.json
index 0637a08..cfbeac5 100644
--- a/usercache.json
+++ b/usercache.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[{"name":"EspiDev","uuid":"4ad26a62-db2a-3ff7-a9b2-83ff8441e443","expiresOn":"2018-11-27 20:56:06 -0500"}]
\ No newline at end of file
diff --git a/version_history.json b/version_history.json
new file mode 100644
index 0000000..9d1466d
--- /dev/null
+++ b/version_history.json
@@ -0,0 +1 @@
+{"currentVersion":"git-Paper-405 (MC: 1.13.2)"}
\ No newline at end of file