Mohammad-Ali Minaie 390248afd3 fixed merge conflicts

2018-01-06 19:35:43 -05:00

..

gradle/wrapper

moved 1.11 to kfc

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

src/main

fixed merge conflicts

2018-01-06 19:35:43 -05:00

.gitignore

moved 1.11 to kfc

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

build.gradle

update to 1.12.1

2017-08-30 19:04:06 -07:00

gradle.properties

fixed merge conflicts

2018-01-06 19:35:43 -05:00

gradlew

replace tag methods with NBTHelpers, fixes null point exception crash

2017-07-16 15:08:28 -04:00

gradlew.bat

moved 1.11 to kfc

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

testbuild.txt

1.12 update

2017-06-26 00:19:38 -04:00

To-Dos.md

moved 1.11 to kfc

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