fixed merge conflicts

This commit is contained in:
Mohammad-Ali Minaie
2018-01-06 19:35:43 -05:00
7 changed files with 13 additions and 13 deletions

View File

@@ -6,10 +6,12 @@ org.gradle.jvmargs=-Xmx3G
mod_group=nmd.primal.forgecraft
mod_name=ForgeCraft
mod_version=1.4.03
forge_version=14.23.0.2517
mod_version=1.4.04
forge_version=14.23.1.2581
mcp_mappings=snapshot_20171003
mc_version=1.12.2
primal_version=0.6+
jei_version=4.8+
waila_version=1.7.0-B3
apple_version=2.1+