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 committed 2014-07-24 21:41:59 -04:00
1 parent bbcc515063
commit a22bcf7e72
1 file changed
+1 -1
+1 -1
Submodule fml updated: 53887ac59c...3231db9376.