Mohammad-Ali Minaie b8b80fb547 Merge branch 'master' into master-1.12

2017-06-25 22:50:14 -04:00

..

gradle/wrapper

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

src/main

Merge branch 'master' into master-1.12

2017-06-25 22:50:14 -04:00

.gitignore

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

banned-ips.json

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

banned-players.json

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

build.gradle

Merge branch 'master' into master-1.12

2017-06-25 22:50:14 -04:00

eula.txt

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

gradle.properties

Merge branch 'master' into master-1.12

2017-06-25 22:50:14 -04:00

gradlew

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

gradlew.bat

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

hs_err_pid57520.log

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

LICENSE-new.txt

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

ops.json

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

server.properties

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

servers.dat

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

testing

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

To-Dos.md

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

whitelist.json

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00

world-20170601-235514.zip

moved 1.11 to kfc

2017-06-25 22:49:46 -04:00