merge conflict in peroperties

2018-02-24 19:45:34 -05:00
parent 72c4677c4b 8932f51e90
commit 31a063532a
5 changed files with 29 additions and 20 deletions
--- a/kfc/gradle.properties
+++ b/kfc/gradle.properties
@@ -15,3 +15,4 @@ primal_version=0.6+
 jei_version=4.8+
 waila_version=1.7.0-B3
 apple_version=2.1+
+craftweaker_version=4.0.9.289