From a22bcf7e72d24a5d7dea2a05b0ef423d134e0c58 Mon Sep 17 00:00:00 2001 From: cpw Date: Thu, 24 Jul 2014 21:41:59 -0400 Subject: [PATCH] MinecraftForge/FML@3231db9376766d619f942b6a526718daa3c68038 Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets into the map, rather than force overwriting. Fixes skyboy's comment. --- fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fml b/fml index 53887ac59c..3231db9376 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 53887ac59cec8f747e21fd251f94d5a438a69114 +Subproject commit 3231db9376766d619f942b6a526718daa3c68038