fixed merge conflicts
This commit is contained in:
@@ -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+
|
||||
|
||||
Reference in New Issue
Block a user