merging in master

2017-07-08 13:59:09 -04:00
parent 8c014f3687 f9e546d66b
commit a270575f13
29 changed files with 845 additions and 150 deletions
--- a/kfc/server.properties
+++ b/kfc/server.properties
@@ -1,5 +1,4 @@
 #Minecraft server properties
-#Tue Jul 04 21:50:19 EDT 2017
 max-tick-time=60000
 generator-settings=
 force-gamemode=false