Weekend 91 final

pickaxe-club · Aug 29, 2016 · 95a7837 · 95a7837
1 parent 4f15d93
commit 95a7837
Show file tree

Hide file tree

Showing 36 changed files with 24 additions and 24 deletions.
diff --git a/server.properties b/server.properties
@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Fri Aug 19 18:33:00 UTC 2016
+#Fri Aug 26 16:17:15 UTC 2016
 spawn-protection=0
 max-tick-time=60000
 generator-settings=
@@ -36,9 +36,9 @@ spawn-animals=true
 white-list=false
 rcon.password=happy-flower-warrior-two
 generate-structures=true
-max-build-height=256
 online-mode=true
+max-build-height=256
 level-seed=
 use-native-transport=true
-enable-rcon=true
 motd=Welcome to pickaxe.club\!
+enable-rcon=true
diff --git a/spigot.yml b/spigot.yml
@@ -36,6 +36,13 @@ settings:
       max: 2048.0
   debug: false
   moved-too-quickly-threshold: 100.0
+messages:
+  whitelist: You are not whitelisted on this server!
+  unknown-command: Unknown command. Type "/help" for help.
+  server-full: The server is full!
+  outdated-client: Outdated client! Please use {0}
+  outdated-server: Outdated server! I'm still on {0}
+  restart: Server is restarting
 commands:
   tab-complete: 0
   log: true
@@ -47,13 +54,6 @@ commands:
   - summon
   - testforblock
   - tellraw
-messages:
-  whitelist: You are not whitelisted on this server!
-  unknown-command: Unknown command. Type "/help" for help.
-  server-full: The server is full!
-  outdated-client: Outdated client! Please use {0}
-  outdated-server: Outdated server! I'm still on {0}
-  restart: Server is restarting
 stats:
   disable-saving: false
   forced-stats: {}
@@ -99,14 +99,14 @@ world-settings:
     max-tick-time:
       tile: 50
       entity: 50
+    enable-zombie-pigmen-portal-spawns: true
     item-despawn-rate: 6000
     merge-radius:
       item: 2.5
       exp: 3.0
     arrow-despawn-rate: 1200
-    enable-zombie-pigmen-portal-spawns: true
-    wither-spawn-sound-radius: 0
     view-distance: 9
+    wither-spawn-sound-radius: 0
     hanging-tick-frequency: 100
     zombie-aggressive-towards-villager: true
     nerf-spawner-mobs: false

diff --git a/usercache.json b/usercache.json
diff --git a/world/data/Temple.dat b/world/data/Temple.dat
diff --git a/world/data/villages.dat b/world/data/villages.dat
diff --git a/world/level.dat b/world/level.dat
diff --git a/world/level.dat_old b/world/level.dat_old
diff --git a/world/playerdata/1719f5a1-cddd-4580-8ee9-ef02da343f38.dat b/world/playerdata/1719f5a1-cddd-4580-8ee9-ef02da343f38.dat
diff --git a/world/playerdata/360ac216-8b92-4f4b-884a-856b6b748035.dat b/world/playerdata/360ac216-8b92-4f4b-884a-856b6b748035.dat
diff --git a/world/playerdata/52ce3fba-1aa1-4548-8841-15b7e942687d.dat b/world/playerdata/52ce3fba-1aa1-4548-8841-15b7e942687d.dat
diff --git a/world/playerdata/61df4e32-e0fc-4d6c-abf5-ecdebd81d759.dat b/world/playerdata/61df4e32-e0fc-4d6c-abf5-ecdebd81d759.dat
diff --git a/world/playerdata/76ebbd40-11ca-43e7-a605-3b8d553abd53.dat b/world/playerdata/76ebbd40-11ca-43e7-a605-3b8d553abd53.dat
diff --git a/world/playerdata/a51f6d4d-0f29-4d2e-b4c6-42aa095c0527.dat b/world/playerdata/a51f6d4d-0f29-4d2e-b4c6-42aa095c0527.dat
diff --git a/world/playerdata/ab9ffd15-2e7e-41be-ba64-70fa71ab15ad.dat b/world/playerdata/ab9ffd15-2e7e-41be-ba64-70fa71ab15ad.dat
diff --git a/world/playerdata/b3ab4001-dc05-4a06-a8bb-2edb5766892a.dat b/world/playerdata/b3ab4001-dc05-4a06-a8bb-2edb5766892a.dat
diff --git a/world/playerdata/d5a21785-2873-4eff-a232-526bfc534dcf.dat b/world/playerdata/d5a21785-2873-4eff-a232-526bfc534dcf.dat
diff --git a/world/playerdata/def678e7-5e95-4128-9252-29ad69b42014.dat b/world/playerdata/def678e7-5e95-4128-9252-29ad69b42014.dat
diff --git a/world/playerdata/efb6fc35-604e-4dd8-93f9-ccdd1593ff69.dat b/world/playerdata/efb6fc35-604e-4dd8-93f9-ccdd1593ff69.dat
diff --git a/world/session.lock b/world/session.lock
diff --git a/world/stats/1719f5a1-cddd-4580-8ee9-ef02da343f38.json b/world/stats/1719f5a1-cddd-4580-8ee9-ef02da343f38.json
diff --git a/world/stats/360ac216-8b92-4f4b-884a-856b6b748035.json b/world/stats/360ac216-8b92-4f4b-884a-856b6b748035.json
diff --git a/world/stats/52ce3fba-1aa1-4548-8841-15b7e942687d.json b/world/stats/52ce3fba-1aa1-4548-8841-15b7e942687d.json
diff --git a/world/stats/61df4e32-e0fc-4d6c-abf5-ecdebd81d759.json b/world/stats/61df4e32-e0fc-4d6c-abf5-ecdebd81d759.json
diff --git a/world/stats/76ebbd40-11ca-43e7-a605-3b8d553abd53.json b/world/stats/76ebbd40-11ca-43e7-a605-3b8d553abd53.json
diff --git a/world/stats/a51f6d4d-0f29-4d2e-b4c6-42aa095c0527.json b/world/stats/a51f6d4d-0f29-4d2e-b4c6-42aa095c0527.json
diff --git a/world/stats/ab9ffd15-2e7e-41be-ba64-70fa71ab15ad.json b/world/stats/ab9ffd15-2e7e-41be-ba64-70fa71ab15ad.json
diff --git a/world/stats/b3ab4001-dc05-4a06-a8bb-2edb5766892a.json b/world/stats/b3ab4001-dc05-4a06-a8bb-2edb5766892a.json
diff --git a/world/stats/d5a21785-2873-4eff-a232-526bfc534dcf.json b/world/stats/d5a21785-2873-4eff-a232-526bfc534dcf.json
diff --git a/world/stats/def678e7-5e95-4128-9252-29ad69b42014.json b/world/stats/def678e7-5e95-4128-9252-29ad69b42014.json
diff --git a/world/stats/efb6fc35-604e-4dd8-93f9-ccdd1593ff69.json b/world/stats/efb6fc35-604e-4dd8-93f9-ccdd1593ff69.json
diff --git a/world_nether/level.dat b/world_nether/level.dat
diff --git a/world_nether/level.dat_old b/world_nether/level.dat_old
diff --git a/world_nether/session.lock b/world_nether/session.lock
diff --git a/world_the_end/level.dat b/world_the_end/level.dat
diff --git a/world_the_end/level.dat_old b/world_the_end/level.dat_old
diff --git a/world_the_end/session.lock b/world_the_end/session.lock