diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eed2ef1..81a398b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,5 @@ before_script:
 build_image:
   script:
     - docker build -t ctf .
-    - docker tag ctf:latest dolphinbox.net:8084/ctf
-    - docker push dolphinbox.net:8084/ctf
+    - docker tag ctf:latest registry.estinet.net/estinet/ctf
+    - docker push registry.estinet.net/estinet/ctf
diff --git a/MinigameSpawn/data/Village.dat b/MinigameSpawn/data/Village.dat
deleted file mode 100644
index 4e645f6..0000000
Binary files a/MinigameSpawn/data/Village.dat and /dev/null differ
diff --git a/MinigameSpawn/data/villages.dat b/MinigameSpawn/data/villages.dat
deleted file mode 100644
index fddf660..0000000
Binary files a/MinigameSpawn/data/villages.dat and /dev/null differ
diff --git a/MinigameSpawn/level.dat b/MinigameSpawn/level.dat
deleted file mode 100644
index 09703e6..0000000
Binary files a/MinigameSpawn/level.dat and /dev/null differ
diff --git a/MinigameSpawn/level.dat_old b/MinigameSpawn/level.dat_old
deleted file mode 100644
index da15341..0000000
Binary files a/MinigameSpawn/level.dat_old and /dev/null differ
diff --git a/MinigameSpawn/region/r.-1.1.mca b/MinigameSpawn/region/r.-1.1.mca
deleted file mode 100644
index 9df9889..0000000
Binary files a/MinigameSpawn/region/r.-1.1.mca and /dev/null differ
diff --git a/MinigameSpawn/region/r.0.0.mca b/MinigameSpawn/region/r.0.0.mca
deleted file mode 100644
index 308f5cd..0000000
Binary files a/MinigameSpawn/region/r.0.0.mca and /dev/null differ
diff --git a/MinigameSpawn/session.lock b/MinigameSpawn/session.lock
deleted file mode 100644
index 4fbf32a..0000000
Binary files a/MinigameSpawn/session.lock and /dev/null differ
diff --git a/MinigameSpawn/uid.dat b/MinigameSpawn/uid.dat
deleted file mode 100644
index 59f2750..0000000
--- a/MinigameSpawn/uid.dat
+++ /dev/null
@@ -1 +0,0 @@
-2Âù>hJú£3*cd•x~
\ No newline at end of file
diff --git a/bukkit.yml b/bukkit.yml
index f3686ff..8795f2e 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 31abb46..5b065de 100644
--- a/commands.yml
+++ b/commands.yml
@@ -1,16 +1,17 @@
 # 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: []
+ignore-vanilla-permissions: false
 aliases:
   icanhasbukkit:
   - version $1-
diff --git a/init.sh b/init.sh
index 34bf4ee..eb23238 100644
--- a/init.sh
+++ b/init.sh
@@ -2,9 +2,8 @@
 echo "Initializing..."
 if [ ! -f "init.lock" ]; then
     echo "Adding log..."
-    echo server-port=$PORT_NUM >> server.properties
     echo "  Name: $CS_NAME" >> plugins/gFeatures/Config.yml
     touch init.lock
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/minecraft_server.jar b/minecraft_server.jar
index ceba98c..95bc2ec 100644
Binary files a/minecraft_server.jar and b/minecraft_server.jar differ
diff --git a/paper.yml b/paper.yml
index 3862a03..6a7df95 100644
--- a/paper.yml
+++ b/paper.yml
@@ -3,30 +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: 12
+config-version: 15
 settings:
   load-permissions-yml-before-plugins: true
   bungee-online-mode: true
+  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
   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
+  save-player-data: true
+  use-versioned-world: false
+  velocity-support:
+    enabled: false
+    online-mode: false
+    secret: ''
   enable-player-collisions: true
   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:
     flying-player: Flying is not enabled on this server
     flying-vehicle: Flying is not enabled on this server
+    authentication-servers-down: ''
+    connection-throttle: Connection throttled! Please wait before reconnecting.
 timings:
   enabled: true
   verbose: true
@@ -38,27 +62,29 @@ 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
     optimize-explosions: false
+    portal-search-radius: 128
+    remove-corrupt-tile-entities: false
     use-chunk-inhabited-timer: true
+    queue-light-updates: 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
-    remove-corrupt-tile-entities: false
-    squid-spawn-height:
-      minimum: 45.0
-      maximum: 63.0
+    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
@@ -70,10 +96,15 @@ world-settings:
       hard: 128
     falling-block-height-nerf: 0
     tnt-entity-height-nerf: 0
-    queue-light-updates: false
-    fast-drain:
-      lava: false
-      water: false
+    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
@@ -83,44 +114,85 @@ world-settings:
       refresh-max: 2d
     filter-nbt-data-from-spawn-eggs-and-related: true
     max-entity-collisions: 8
-    water-over-lava-flow-speed: 5
-    lava-flow-speed:
-      normal: 30
-      nether: 10
-    portal-search-radius: 128
-    keep-spawn-loaded-range: 8
-    auto-save-interval: -1
-    nether-ceiling-void-damage: false
-    allow-non-player-entities-on-scoreboards: false
+    disable-creeper-lingering-effect: false
     hopper:
+      cooldown-when-full: true
+      disable-move-event: false
       push-based: false
-    frosted-ice:
-      enabled: true
-      delay:
-        min: 20
-        max: 40
-    disable-explosion-knockback: false
-    elytra-hit-wall-damage: true
-    grass-spread-tick-rate: 1
-    enable-old-tnt-cannon-behaviors: false
-    game-mechanics:
-      disable-chest-cat-detection: false
-      disable-end-credits: false
-    use-alternate-fallingblock-onGround-detection: false
-    non-player-arrow-despawn-rate: -1
+    duplicate-uuid-resolver: saferegen
+    duplicate-uuid-saferegen-delete-range: 32
     keep-spawn-loaded: true
-    armor-stands-do-collision-entity-lookups: true
-    spawner-nerfed-mobs-should-jump: false
+    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
+      - coal_ore
+      - lapis_ore
+      - mossy_cobblestone
+      - obsidian
+      - chest
+      - diamond_ore
+      - redstone_ore
+      - lit_redstone_ore
+      - clay
+      - emerald_ore
+      - ender_chest
+      replacement-blocks:
+      - stone
+      - planks
+    experience-merge-max-value: -1
+    keep-spawn-loaded-range: 8
+    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
-    allow-leashing-undead-horse: false
+    skip-entity-ticking-in-chunks-scheduled-for-unload: true
+    armor-stands-do-collision-entity-lookups: true
+    water-over-lava-flow-speed: 5
+    bed-search-radius: 1
+    grass-spread-tick-rate: 1
+    container-update-tick-rate: 1
+    nether-ceiling-void-damage: false
+    allow-non-player-entities-on-scoreboards: false
+    non-player-arrow-despawn-rate: -1
+    creative-arrow-despawn-rate: -1
+    parrots-are-unaffected-by-player-movement: false
+    prevent-tnt-from-moving-in-water: false
+    disable-explosion-knockback: false
+    armor-stands-tick: true
+    spawner-nerfed-mobs-should-jump: false
     baby-zombie-movement-speed: 0.5
-    mob-spawner-tick-rate: 1
+    allow-leashing-undead-horse: false
     all-chunks-are-slime-chunks: false
-    container-update-tick-rate: 1
+    mob-spawner-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
+    enable-old-tnt-cannon-behaviors: 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
     verbose: false
diff --git a/plugins/CrackShot.jar b/plugins/CrackShot.jar
index a930b43..ff44a0e 100644
Binary files a/plugins/CrackShot.jar and b/plugins/CrackShot.jar differ
diff --git a/plugins/Projangtile.jar b/plugins/Projangtile.jar
deleted file mode 100644
index 5369988..0000000
Binary files a/plugins/Projangtile.jar and /dev/null differ
diff --git a/plugins/ProtocolSupport.jar b/plugins/ProtocolSupport.jar
new file mode 100644
index 0000000..c641812
Binary files /dev/null and b/plugins/ProtocolSupport.jar differ
diff --git a/plugins/gFeatures.jar b/plugins/gFeatures.jar
index c2c411d..e8025ca 100644
Binary files a/plugins/gFeatures.jar and b/plugins/gFeatures.jar differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/EndCity_index.dat b/plugins/gFeatures/CTF/CTF1/data/EndCity_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/EndCity_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/Fortress_index.dat b/plugins/gFeatures/CTF/CTF1/data/Fortress_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/Fortress_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/Mansion_index.dat b/plugins/gFeatures/CTF/CTF1/data/Mansion_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/Mansion_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/Mineshaft_index.dat b/plugins/gFeatures/CTF/CTF1/data/Mineshaft_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/Mineshaft_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/Monument_index.dat b/plugins/gFeatures/CTF/CTF1/data/Monument_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/Monument_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/Stronghold_index.dat b/plugins/gFeatures/CTF/CTF1/data/Stronghold_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/Stronghold_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/Temple_index.dat b/plugins/gFeatures/CTF/CTF1/data/Temple_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/Temple_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/Village_index.dat b/plugins/gFeatures/CTF/CTF1/data/Village_index.dat
new file mode 100644
index 0000000..46b6020
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/Village_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/villages.dat b/plugins/gFeatures/CTF/CTF1/data/villages.dat
index e283db8..d6b941c 100644
Binary files a/plugins/gFeatures/CTF/CTF1/data/villages.dat and b/plugins/gFeatures/CTF/CTF1/data/villages.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/villages_end.dat b/plugins/gFeatures/CTF/CTF1/data/villages_end.dat
new file mode 100644
index 0000000..6350f64
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/villages_end.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/data/villages_nether.dat b/plugins/gFeatures/CTF/CTF1/data/villages_nether.dat
new file mode 100644
index 0000000..6350f64
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/data/villages_nether.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/datapacks/bukkit/pack.mcmeta b/plugins/gFeatures/CTF/CTF1/datapacks/bukkit/pack.mcmeta
new file mode 100644
index 0000000..76afe9d
--- /dev/null
+++ b/plugins/gFeatures/CTF/CTF1/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/plugins/gFeatures/CTF/CTF1/level.dat b/plugins/gFeatures/CTF/CTF1/level.dat
index 0226aa2..8bffed7 100644
Binary files a/plugins/gFeatures/CTF/CTF1/level.dat and b/plugins/gFeatures/CTF/CTF1/level.dat differ
diff --git a/plugins/gFeatures/CTF/CTF1/level.dat_old b/plugins/gFeatures/CTF/CTF1/level.dat_old
index 0032d02..25ca4d5 100644
Binary files a/plugins/gFeatures/CTF/CTF1/level.dat_old and b/plugins/gFeatures/CTF/CTF1/level.dat_old differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.-1.-1.mca b/plugins/gFeatures/CTF/CTF1/region/r.-1.-1.mca
index 90ec588..18ef6a7 100644
Binary files a/plugins/gFeatures/CTF/CTF1/region/r.-1.-1.mca and b/plugins/gFeatures/CTF/CTF1/region/r.-1.-1.mca differ
diff --git a/MinigameSpawn/region/r.-1.-1.mca b/plugins/gFeatures/CTF/CTF1/region/r.-1.-1.mca.2018-10-29.corrupt
similarity index 71%
rename from MinigameSpawn/region/r.-1.-1.mca
rename to plugins/gFeatures/CTF/CTF1/region/r.-1.-1.mca.2018-10-29.corrupt
index 7e33d53..90ec588 100644
Binary files a/MinigameSpawn/region/r.-1.-1.mca and b/plugins/gFeatures/CTF/CTF1/region/r.-1.-1.mca.2018-10-29.corrupt differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.-1.0.mca b/plugins/gFeatures/CTF/CTF1/region/r.-1.0.mca
index 4a2e923..95cddbe 100644
Binary files a/plugins/gFeatures/CTF/CTF1/region/r.-1.0.mca and b/plugins/gFeatures/CTF/CTF1/region/r.-1.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.-2.-1.mca b/plugins/gFeatures/CTF/CTF1/region/r.-2.-1.mca
index e69de29..6d17cf9 100644
Binary files a/plugins/gFeatures/CTF/CTF1/region/r.-2.-1.mca and b/plugins/gFeatures/CTF/CTF1/region/r.-2.-1.mca differ
diff --git a/MinigameSpawn/region/r.1.1.mca b/plugins/gFeatures/CTF/CTF1/region/r.-2.-2.mca
similarity index 100%
rename from MinigameSpawn/region/r.1.1.mca
rename to plugins/gFeatures/CTF/CTF1/region/r.-2.-2.mca
diff --git a/MinigameSpawn/region/r.2.0.mca b/plugins/gFeatures/CTF/CTF1/region/r.-2.-3.mca
similarity index 100%
rename from MinigameSpawn/region/r.2.0.mca
rename to plugins/gFeatures/CTF/CTF1/region/r.-2.-3.mca
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.-3.-1.mca b/plugins/gFeatures/CTF/CTF1/region/r.-3.-1.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/region/r.-3.-1.mca differ
diff --git a/MinigameSpawn/region/r.0.1.mca b/plugins/gFeatures/CTF/CTF1/region/r.-3.-2.mca
similarity index 58%
rename from MinigameSpawn/region/r.0.1.mca
rename to plugins/gFeatures/CTF/CTF1/region/r.-3.-2.mca
index d0625f5..d9a5a77 100644
Binary files a/MinigameSpawn/region/r.0.1.mca and b/plugins/gFeatures/CTF/CTF1/region/r.-3.-2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.-3.-3.mca b/plugins/gFeatures/CTF/CTF1/region/r.-3.-3.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/region/r.-3.-3.mca differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.-4.-1.mca b/plugins/gFeatures/CTF/CTF1/region/r.-4.-1.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/region/r.-4.-1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.-4.-2.mca b/plugins/gFeatures/CTF/CTF1/region/r.-4.-2.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/region/r.-4.-2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.-4.-3.mca b/plugins/gFeatures/CTF/CTF1/region/r.-4.-3.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/region/r.-4.-3.mca differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.0.-1.mca b/plugins/gFeatures/CTF/CTF1/region/r.0.-1.mca
index ccca6ab..79d8e47 100644
Binary files a/plugins/gFeatures/CTF/CTF1/region/r.0.-1.mca and b/plugins/gFeatures/CTF/CTF1/region/r.0.-1.mca differ
diff --git a/MinigameSpawn/region/r.-1.0.mca b/plugins/gFeatures/CTF/CTF1/region/r.0.-1.mca.2018-10-29.corrupt
similarity index 73%
rename from MinigameSpawn/region/r.-1.0.mca
rename to plugins/gFeatures/CTF/CTF1/region/r.0.-1.mca.2018-10-29.corrupt
index b02b948..ccca6ab 100644
Binary files a/MinigameSpawn/region/r.-1.0.mca and b/plugins/gFeatures/CTF/CTF1/region/r.0.-1.mca.2018-10-29.corrupt differ
diff --git a/plugins/gFeatures/CTF/CTF1/region/r.0.0.mca b/plugins/gFeatures/CTF/CTF1/region/r.0.0.mca
index e82e633..8eb3675 100644
Binary files a/plugins/gFeatures/CTF/CTF1/region/r.0.0.mca and b/plugins/gFeatures/CTF/CTF1/region/r.0.0.mca differ
diff --git a/MinigameSpawn/region/r.0.-1.mca b/plugins/gFeatures/CTF/CTF1/region/r.0.0.mca.2018-10-29.corrupt
similarity index 53%
rename from MinigameSpawn/region/r.0.-1.mca
rename to plugins/gFeatures/CTF/CTF1/region/r.0.0.mca.2018-10-29.corrupt
index 9257f4a..e82e633 100644
Binary files a/MinigameSpawn/region/r.0.-1.mca and b/plugins/gFeatures/CTF/CTF1/region/r.0.0.mca.2018-10-29.corrupt differ
diff --git a/plugins/gFeatures/CTF/CTF1/session.lock b/plugins/gFeatures/CTF/CTF1/session.lock
new file mode 100644
index 0000000..029142f
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF1/session.lock differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/EndCity_index.dat b/plugins/gFeatures/CTF/CTF2/data/EndCity_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/EndCity_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/Fortress_index.dat b/plugins/gFeatures/CTF/CTF2/data/Fortress_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/Fortress_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/Mansion_index.dat b/plugins/gFeatures/CTF/CTF2/data/Mansion_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/Mansion_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/Mineshaft_index.dat b/plugins/gFeatures/CTF/CTF2/data/Mineshaft_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/Mineshaft_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/Monument_index.dat b/plugins/gFeatures/CTF/CTF2/data/Monument_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/Monument_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/Stronghold_index.dat b/plugins/gFeatures/CTF/CTF2/data/Stronghold_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/Stronghold_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/Temple_index.dat b/plugins/gFeatures/CTF/CTF2/data/Temple_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/Temple_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/Village_index.dat b/plugins/gFeatures/CTF/CTF2/data/Village_index.dat
new file mode 100644
index 0000000..19ace0f
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/Village_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/villages.dat b/plugins/gFeatures/CTF/CTF2/data/villages.dat
index 8ee864d..3a5d8f7 100755
Binary files a/plugins/gFeatures/CTF/CTF2/data/villages.dat and b/plugins/gFeatures/CTF/CTF2/data/villages.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/villages_end.dat b/plugins/gFeatures/CTF/CTF2/data/villages_end.dat
new file mode 100644
index 0000000..556fbe3
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/villages_end.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/data/villages_nether.dat b/plugins/gFeatures/CTF/CTF2/data/villages_nether.dat
new file mode 100644
index 0000000..556fbe3
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/data/villages_nether.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/datapacks/bukkit/pack.mcmeta b/plugins/gFeatures/CTF/CTF2/datapacks/bukkit/pack.mcmeta
new file mode 100644
index 0000000..76afe9d
--- /dev/null
+++ b/plugins/gFeatures/CTF/CTF2/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/plugins/gFeatures/CTF/CTF2/level.dat b/plugins/gFeatures/CTF/CTF2/level.dat
index 1fa447a..c9c1292 100644
Binary files a/plugins/gFeatures/CTF/CTF2/level.dat and b/plugins/gFeatures/CTF/CTF2/level.dat differ
diff --git a/plugins/gFeatures/CTF/CTF2/level.dat_old b/plugins/gFeatures/CTF/CTF2/level.dat_old
index e736e10..3281031 100644
Binary files a/plugins/gFeatures/CTF/CTF2/level.dat_old and b/plugins/gFeatures/CTF/CTF2/level.dat_old differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.-1.-1.mca b/plugins/gFeatures/CTF/CTF2/region/r.-1.-1.mca
index f280e6d..802abaf 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.-1.-1.mca and b/plugins/gFeatures/CTF/CTF2/region/r.-1.-1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.-1.0.mca b/plugins/gFeatures/CTF/CTF2/region/r.-1.0.mca
index ed1a1d5..68f3988 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.-1.0.mca and b/plugins/gFeatures/CTF/CTF2/region/r.-1.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.-1.1.mca b/plugins/gFeatures/CTF/CTF2/region/r.-1.1.mca
index e37a1e5..2842a75 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.-1.1.mca and b/plugins/gFeatures/CTF/CTF2/region/r.-1.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.0.-1.mca b/plugins/gFeatures/CTF/CTF2/region/r.0.-1.mca
index 1a519e7..be7e379 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.0.-1.mca and b/plugins/gFeatures/CTF/CTF2/region/r.0.-1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.0.0.mca b/plugins/gFeatures/CTF/CTF2/region/r.0.0.mca
index 1ae58c6..ea24c2e 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.0.0.mca and b/plugins/gFeatures/CTF/CTF2/region/r.0.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.0.1.mca b/plugins/gFeatures/CTF/CTF2/region/r.0.1.mca
index afe025e..f3aa7a7 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.0.1.mca and b/plugins/gFeatures/CTF/CTF2/region/r.0.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.1.0.mca b/plugins/gFeatures/CTF/CTF2/region/r.1.0.mca
index 8003b33..77e17c5 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.1.0.mca and b/plugins/gFeatures/CTF/CTF2/region/r.1.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.1.1.mca b/plugins/gFeatures/CTF/CTF2/region/r.1.1.mca
index 2982190..3f79cf9 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.1.1.mca and b/plugins/gFeatures/CTF/CTF2/region/r.1.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.1.2.mca b/plugins/gFeatures/CTF/CTF2/region/r.1.2.mca
index 50e5d3f..bf349cf 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.1.2.mca and b/plugins/gFeatures/CTF/CTF2/region/r.1.2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.2.0.mca b/plugins/gFeatures/CTF/CTF2/region/r.2.0.mca
index cf31b11..a62f634 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.2.0.mca and b/plugins/gFeatures/CTF/CTF2/region/r.2.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.2.1.mca b/plugins/gFeatures/CTF/CTF2/region/r.2.1.mca
index 2f6c072..80f59b5 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.2.1.mca and b/plugins/gFeatures/CTF/CTF2/region/r.2.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.2.2.mca b/plugins/gFeatures/CTF/CTF2/region/r.2.2.mca
index 94744b2..ef4ae2c 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.2.2.mca and b/plugins/gFeatures/CTF/CTF2/region/r.2.2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.3.0.mca b/plugins/gFeatures/CTF/CTF2/region/r.3.0.mca
index f3b07d2..e04877b 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.3.0.mca and b/plugins/gFeatures/CTF/CTF2/region/r.3.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.3.1.mca b/plugins/gFeatures/CTF/CTF2/region/r.3.1.mca
index e572636..660f770 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.3.1.mca and b/plugins/gFeatures/CTF/CTF2/region/r.3.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.3.2.mca b/plugins/gFeatures/CTF/CTF2/region/r.3.2.mca
index 2b99df0..da2ed0e 100755
Binary files a/plugins/gFeatures/CTF/CTF2/region/r.3.2.mca and b/plugins/gFeatures/CTF/CTF2/region/r.3.2.mca differ
diff --git a/MinigameSpawn/region/r.0.-2.mca b/plugins/gFeatures/CTF/CTF2/region/r.38.25.mca
similarity index 75%
rename from MinigameSpawn/region/r.0.-2.mca
rename to plugins/gFeatures/CTF/CTF2/region/r.38.25.mca
index ba2e52a..f86fe63 100644
Binary files a/MinigameSpawn/region/r.0.-2.mca and b/plugins/gFeatures/CTF/CTF2/region/r.38.25.mca differ
diff --git a/MinigameSpawn/region/r.-1.-2.mca b/plugins/gFeatures/CTF/CTF2/region/r.38.26.mca
similarity index 83%
rename from MinigameSpawn/region/r.-1.-2.mca
rename to plugins/gFeatures/CTF/CTF2/region/r.38.26.mca
index cd75c44..7e9720c 100644
Binary files a/MinigameSpawn/region/r.-1.-2.mca and b/plugins/gFeatures/CTF/CTF2/region/r.38.26.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.39.25.mca b/plugins/gFeatures/CTF/CTF2/region/r.39.25.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/region/r.39.25.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/region/r.39.26.mca b/plugins/gFeatures/CTF/CTF2/region/r.39.26.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/region/r.39.26.mca differ
diff --git a/plugins/gFeatures/CTF/CTF2/session.lock b/plugins/gFeatures/CTF/CTF2/session.lock
new file mode 100644
index 0000000..da59cc9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF2/session.lock differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/EndCity_index.dat b/plugins/gFeatures/CTF/CTF3/data/EndCity_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/EndCity_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/Fortress_index.dat b/plugins/gFeatures/CTF/CTF3/data/Fortress_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/Fortress_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/Mansion_index.dat b/plugins/gFeatures/CTF/CTF3/data/Mansion_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/Mansion_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/Mineshaft_index.dat b/plugins/gFeatures/CTF/CTF3/data/Mineshaft_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/Mineshaft_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/Monument_index.dat b/plugins/gFeatures/CTF/CTF3/data/Monument_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/Monument_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/Stronghold_index.dat b/plugins/gFeatures/CTF/CTF3/data/Stronghold_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/Stronghold_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/Temple_index.dat b/plugins/gFeatures/CTF/CTF3/data/Temple_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/Temple_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/Village_index.dat b/plugins/gFeatures/CTF/CTF3/data/Village_index.dat
new file mode 100644
index 0000000..a960c44
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/Village_index.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/villages.dat b/plugins/gFeatures/CTF/CTF3/data/villages.dat
index c8732b6..d2b3b8d 100644
Binary files a/plugins/gFeatures/CTF/CTF3/data/villages.dat and b/plugins/gFeatures/CTF/CTF3/data/villages.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/villages_end.dat b/plugins/gFeatures/CTF/CTF3/data/villages_end.dat
new file mode 100644
index 0000000..38b407f
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/villages_end.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/data/villages_nether.dat b/plugins/gFeatures/CTF/CTF3/data/villages_nether.dat
new file mode 100644
index 0000000..38b407f
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/data/villages_nether.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/datapacks/bukkit/pack.mcmeta b/plugins/gFeatures/CTF/CTF3/datapacks/bukkit/pack.mcmeta
new file mode 100644
index 0000000..76afe9d
--- /dev/null
+++ b/plugins/gFeatures/CTF/CTF3/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/plugins/gFeatures/CTF/CTF3/level.dat b/plugins/gFeatures/CTF/CTF3/level.dat
index 8d3f19b..5b4a4b5 100644
Binary files a/plugins/gFeatures/CTF/CTF3/level.dat and b/plugins/gFeatures/CTF/CTF3/level.dat differ
diff --git a/plugins/gFeatures/CTF/CTF3/level.dat_old b/plugins/gFeatures/CTF/CTF3/level.dat_old
index 109c454..5848639 100644
Binary files a/plugins/gFeatures/CTF/CTF3/level.dat_old and b/plugins/gFeatures/CTF/CTF3/level.dat_old differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-1.-1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-1.-1.mca
index 8757f28..1c6e899 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-1.-1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-1.-1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-1.-2.mca b/plugins/gFeatures/CTF/CTF3/region/r.-1.-2.mca
index 7387f06..bbf244e 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-1.-2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-1.-2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-1.0.mca b/plugins/gFeatures/CTF/CTF3/region/r.-1.0.mca
index b92cc53..008e5cd 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-1.0.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-1.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-1.1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-1.1.mca
index fce7fb4..ebd1353 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-1.1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-1.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-1.2.mca b/plugins/gFeatures/CTF/CTF3/region/r.-1.2.mca
index 4644da0..75d08b3 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-1.2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-1.2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-2.-1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-2.-1.mca
index 8f7c7a8..9b918b6 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-2.-1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-2.-1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-2.-2.mca b/plugins/gFeatures/CTF/CTF3/region/r.-2.-2.mca
index 27c9f22..d72e0d5 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-2.-2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-2.-2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-2.0.mca b/plugins/gFeatures/CTF/CTF3/region/r.-2.0.mca
index 1b7c67e..6e392ce 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-2.0.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-2.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-2.1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-2.1.mca
index 19a8260..457069c 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-2.1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-2.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-2.2.mca b/plugins/gFeatures/CTF/CTF3/region/r.-2.2.mca
index 5a222a7..14fd49b 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-2.2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-2.2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-21.7.mca b/plugins/gFeatures/CTF/CTF3/region/r.-21.7.mca
new file mode 100644
index 0000000..be0f26b
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/region/r.-21.7.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-21.8.mca b/plugins/gFeatures/CTF/CTF3/region/r.-21.8.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/region/r.-21.8.mca differ
diff --git a/MinigameSpawn/region/r.1.-1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-22.7.mca
similarity index 83%
rename from MinigameSpawn/region/r.1.-1.mca
rename to plugins/gFeatures/CTF/CTF3/region/r.-22.7.mca
index 9dc1166..714d28a 100644
Binary files a/MinigameSpawn/region/r.1.-1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-22.7.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-22.8.mca b/plugins/gFeatures/CTF/CTF3/region/r.-22.8.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/region/r.-22.8.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-3.-1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-3.-1.mca
index 3a00b5e..8dfe8c5 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-3.-1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-3.-1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-3.-2.mca b/plugins/gFeatures/CTF/CTF3/region/r.-3.-2.mca
index f24c182..570ab90 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-3.-2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-3.-2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-3.0.mca b/plugins/gFeatures/CTF/CTF3/region/r.-3.0.mca
index fc1cd0b..73c3734 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-3.0.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-3.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-3.1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-3.1.mca
index 0f4214e..12818fe 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-3.1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-3.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-3.2.mca b/plugins/gFeatures/CTF/CTF3/region/r.-3.2.mca
index 45aa8bb..3fd7962 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-3.2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-3.2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-4.-1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-4.-1.mca
index 3e3334a..451839b 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-4.-1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-4.-1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-4.-2.mca b/plugins/gFeatures/CTF/CTF3/region/r.-4.-2.mca
index 7312dc6..dd51c7c 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-4.-2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-4.-2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-4.0.mca b/plugins/gFeatures/CTF/CTF3/region/r.-4.0.mca
index e3c777b..e9fdb60 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-4.0.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-4.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-4.1.mca b/plugins/gFeatures/CTF/CTF3/region/r.-4.1.mca
index 9ca451e..0be2ac7 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-4.1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-4.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.-4.2.mca b/plugins/gFeatures/CTF/CTF3/region/r.-4.2.mca
index c171d88..fe6e861 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.-4.2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.-4.2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.0.-1.mca b/plugins/gFeatures/CTF/CTF3/region/r.0.-1.mca
index 30e8ad8..94f0cbf 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.0.-1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.0.-1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.0.-2.mca b/plugins/gFeatures/CTF/CTF3/region/r.0.-2.mca
index 1c4ce73..49db493 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.0.-2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.0.-2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.0.0.mca b/plugins/gFeatures/CTF/CTF3/region/r.0.0.mca
index 862defe..37fa61d 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.0.0.mca and b/plugins/gFeatures/CTF/CTF3/region/r.0.0.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.0.1.mca b/plugins/gFeatures/CTF/CTF3/region/r.0.1.mca
index abf3342..b1bf0de 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.0.1.mca and b/plugins/gFeatures/CTF/CTF3/region/r.0.1.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/region/r.0.2.mca b/plugins/gFeatures/CTF/CTF3/region/r.0.2.mca
index b5c645a..7091f8f 100644
Binary files a/plugins/gFeatures/CTF/CTF3/region/r.0.2.mca and b/plugins/gFeatures/CTF/CTF3/region/r.0.2.mca differ
diff --git a/plugins/gFeatures/CTF/CTF3/session.lock b/plugins/gFeatures/CTF/CTF3/session.lock
new file mode 100644
index 0000000..31cb5f3
Binary files /dev/null and b/plugins/gFeatures/CTF/CTF3/session.lock differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/EndCity_index.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/EndCity_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/EndCity_index.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/Fortress_index.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/Fortress_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/Fortress_index.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/Mansion_index.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/Mansion_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/Mansion_index.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/Mineshaft_index.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/Mineshaft_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/Mineshaft_index.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/Monument_index.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/Monument_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/Monument_index.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/Stronghold_index.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/Stronghold_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/Stronghold_index.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/Temple_index.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/Temple_index.dat
new file mode 100644
index 0000000..388edd5
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/Temple_index.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/Village_index.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/Village_index.dat
new file mode 100644
index 0000000..1c82570
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/Village_index.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/villages_end.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/villages_end.dat
new file mode 100644
index 0000000..1d15496
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/villages_end.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/data/villages_nether.dat b/plugins/gFeatures/CTF/MinigameSpawn/data/villages_nether.dat
new file mode 100644
index 0000000..1d15496
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/data/villages_nether.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/datapacks/bukkit/pack.mcmeta b/plugins/gFeatures/CTF/MinigameSpawn/datapacks/bukkit/pack.mcmeta
new file mode 100644
index 0000000..76afe9d
--- /dev/null
+++ b/plugins/gFeatures/CTF/MinigameSpawn/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/plugins/gFeatures/CTF/MinigameSpawn/level.dat b/plugins/gFeatures/CTF/MinigameSpawn/level.dat
index 09703e6..8fdd13f 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/level.dat and b/plugins/gFeatures/CTF/MinigameSpawn/level.dat differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/level.dat_old b/plugins/gFeatures/CTF/MinigameSpawn/level.dat_old
index da15341..0ba2c6a 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/level.dat_old and b/plugins/gFeatures/CTF/MinigameSpawn/level.dat_old differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.-1.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.-1.mca
index 7e33d53..6ab8007 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.-1.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.-1.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.-2.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.-2.mca
index cd75c44..30993aa 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.-2.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.-2.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.0.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.0.mca
index b02b948..cace10b 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.0.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.0.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.1.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.1.mca
index 9df9889..6b1e32c 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.1.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.-1.1.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.-1.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.-1.mca
index 9257f4a..c97a9fa 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.-1.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.-1.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.-2.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.-2.mca
index ba2e52a..38a27ec 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.-2.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.-2.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.0.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.0.mca
index 308f5cd..21ac58f 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.0.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.0.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.1.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.1.mca
index d0625f5..ace8540 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.1.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.0.1.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.1.-1.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.1.-1.mca
index 9dc1166..fbcb75c 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.1.-1.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.1.-1.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.1.0.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.1.0.mca
index 1c1a372..fe88180 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/region/r.1.0.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.1.0.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.8.-1.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.8.-1.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.8.-1.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.8.-2.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.8.-2.mca
new file mode 100644
index 0000000..6d17cf9
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.8.-2.mca differ
diff --git a/MinigameSpawn/region/r.1.0.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.9.-1.mca
similarity index 82%
rename from MinigameSpawn/region/r.1.0.mca
rename to plugins/gFeatures/CTF/MinigameSpawn/region/r.9.-1.mca
index 1c1a372..67c86e7 100644
Binary files a/MinigameSpawn/region/r.1.0.mca and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.9.-1.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/region/r.9.-2.mca b/plugins/gFeatures/CTF/MinigameSpawn/region/r.9.-2.mca
new file mode 100644
index 0000000..6dbc667
Binary files /dev/null and b/plugins/gFeatures/CTF/MinigameSpawn/region/r.9.-2.mca differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/session.lock b/plugins/gFeatures/CTF/MinigameSpawn/session.lock
index 4fbf32a..7f0d79c 100644
Binary files a/plugins/gFeatures/CTF/MinigameSpawn/session.lock and b/plugins/gFeatures/CTF/MinigameSpawn/session.lock differ
diff --git a/plugins/gFeatures/CTF/MinigameSpawn/uid.dat b/plugins/gFeatures/CTF/MinigameSpawn/uid.dat
deleted file mode 100644
index 59f2750..0000000
--- a/plugins/gFeatures/CTF/MinigameSpawn/uid.dat
+++ /dev/null
@@ -1 +0,0 @@
-2Âù>hJú£3*cd•x~
\ No newline at end of file
diff --git a/plugins/gFeatures/Config.yml b/plugins/gFeatures/Config.yml
index 5e13ea1..8524f4d 100644
--- a/plugins/gFeatures/Config.yml
+++ b/plugins/gFeatures/Config.yml
@@ -19,12 +19,14 @@ Config:
     FusionPlay: 'false'
     SurvivalTwo: 'false'
     EstiCoins: 'true'
+    EstiTicket: 'false'
   Extensions:
     Utility:
       gBroadcast: 'false'
       gMotd: 'false'
       EstiJoin: 'false'
     Other: {}
+    Skript: {}
   MySQL:
     Address: localhost
     Port: '3306'
@@ -33,7 +35,7 @@ Config:
     Password: pass123
     State: 'false'
 ClioteSky:
-  Address: 'cliotesky.estinet.net'
+  Address: cliotesky.estinet.net
   Port: '36000'
   Category: CTF
   Enable: 'true'
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 c9e712d..427d199 100644
--- a/server.properties
+++ b/server.properties
@@ -1,10 +1,11 @@
 #Minecraft server properties
-#Sat Aug 05 05:23:53 EDT 2017
+#Mon Oct 29 18:07:26 EDT 2018
 spawn-protection=0
 server-name=Unknown Server
 generator-settings=
 force-gamemode=true
 allow-nether=false
+enforce-whitelist=false
 gamemode=2
 broadcast-console-to-ops=true
 enable-query=false
@@ -22,6 +23,7 @@ network-compression-threshold=256
 resource-pack-sha1=
 max-world-size=29999984
 rcon.port=25509
+server-port=25565
 debug=false
 server-ip=
 spawn-npcs=false
@@ -40,4 +42,3 @@ prevent-proxy-connections=false
 use-native-transport=true
 motd=CTF
 enable-rcon=false
-server-port=25565
diff --git a/spigot.yml b/spigot.yml
index e008b99..b6a5d92 100644
--- a/spigot.yml
+++ b/spigot.yml
@@ -11,39 +11,19 @@
 # Forums: http://www.spigotmc.org/
 
 config-version: 11
-commands:
-  tab-complete: -1
-  log: true
-  spam-exclusions:
-  - /skill
-  silent-commandblock-console: false
-  replace-commands:
-  - setblock
-  - summon
-  - testforblock
-  - tellraw
-messages:
-  whitelist: '[&6&lEsti&3&lNet&r]&7You aren''t whitelisted.'
-  unknown-command: '[&6&lEsti&3&lNet&r]&7 Unknown 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...'
 settings:
+  debug: false
   save-user-cache-on-stop-only: false
+  sample-count: 0
+  timeout-time: 60
+  restart-on-crash: true
+  restart-script: ./startctf.bat
   bungeecord: true
   late-bind: true
-  sample-count: 0
   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: true
-  restart-script: ./startctf.bat
   netty-threads: 4
   attribute:
     maxHealth:
@@ -52,20 +32,40 @@ settings:
       max: 2048.0
     attackDamage:
       max: 2048
-  debug: false
+  filter-creative-items: true
+  int-cache-limit: 1024
+  item-dirty-ticks: 20
   moved-too-quickly-threshold: 100.0
-advancements:
-  disable-saving: false
-  disabled:
-  - minecraft:story/disabled
+messages:
+  whitelist: '[&6&lEsti&3&lNet&r]&7You aren''t whitelisted.'
+  unknown-command: '[&6&lEsti&3&lNet&r]&7 Unknown 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: true
   forced-stats:
     achievements: []
+commands:
+  tab-complete: -1
+  send-namespaced: true
+  log: true
+  spam-exclusions:
+  - /skill
+  silent-commandblock-console: false
+  replace-commands:
+  - setblock
+  - summon
+  - testforblock
+  - tellraw
+advancements:
+  disable-saving: false
+  disabled:
+  - minecraft:story/disabled
 world-settings:
   default:
     verbose: true
-    mob-spawn-range: 0
     growth:
       cactus-modifier: 0
       cane-modifier: 0
@@ -81,22 +81,18 @@ world-settings:
       animals: 20
       monsters: 20
       misc: 20
-    entity-tracking-range:
-      players: 500
-      animals: 48
-      monsters: 48
-      misc: 200
-      other: 200
-    ticks-per:
-      hopper-transfer: 8
-      hopper-check: 1
-    hopper-amount: 1
+      water: 16
+      tick-inactive-villagers: true
     random-light-updates: true
-    save-structure-info: 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
@@ -112,18 +108,33 @@ world-settings:
     max-tick-time:
       tile: 15
       entity: 35
-    item-despawn-rate: 6000
+    squid-spawn-range:
+      min: 45.0
+    mob-spawn-range: 0
+    entity-tracking-range:
+      players: 500
+      animals: 48
+      monsters: 48
+      misc: 200
+      other: 200
+    ticks-per:
+      hopper-transfer: 8
+      hopper-check: 1
+    hopper-amount: 1
     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
+    arrow-despawn-rate: 1200
     view-distance: 12
+    wither-spawn-sound-radius: 0
     hanging-tick-frequency: 100
     zombie-aggressive-towards-villager: false
     nerf-spawner-mobs: false
     max-entity-collisions: 8
+    save-structure-info: false
+    seed-feature: 14357617
     anti-xray:
       enabled: false
       engine-mode: 1
diff --git a/version_history.json b/version_history.json
new file mode 100644
index 0000000..b2c13fb
--- /dev/null
+++ b/version_history.json
@@ -0,0 +1 @@
+{"currentVersion":"git-Paper-408 (MC: 1.13.2)"}
\ No newline at end of file