MinecraftForge/FML@3231db9376 Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets into the map, rather than force overwriting. Fixes skyboy's comment.

This commit is contained in:
cpw 2014-07-24 21:41:59 -04:00
parent bbcc515063
commit a22bcf7e72

2
fml

@ -1 +1 @@
Subproject commit 53887ac59cec8f747e21fd251f94d5a438a69114
Subproject commit 3231db9376766d619f942b6a526718daa3c68038