Merge branch 'master' into featureMoreIron

This commit is contained in:
Mohammad-Ali Minaie
2017-04-22 15:03:29 -04:00

View File

@@ -10,7 +10,7 @@ forge_version=13.20.0.2226
mcp_mappings=snapshot_20161220 mcp_mappings=snapshot_20161220
mc_version=1.11.2 mc_version=1.11.2
primal_version=0.3.10 primal_version=0.3+
jei_version=4.2+ jei_version=4.2+
waila_version=1.7.0-B3 waila_version=1.7.0-B3
apple_version=2.1+ apple_version=2.1+