mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
Fix conflicts
This commit is contained in:
1 parent
f4afb6f56c
commit
d032a34aaa
3 files changed
+3
-3
No files matched your search
+1
-1
@@ -134,7 +134,7 @@ enum FMLHandshakeClientState implements IHandshakeState<FMLHandshakeClientState>
|
||||
|
||||
if (pkt.hasMore())
|
||||
{
|
||||
FMLLog.log.debug("Received Mod Registry mapping for {}: {} IDs {} subs {} dummied", pkt.getName(), entry.ids.size(), entry.substitutions.size(), entry.dummied.size());
|
||||
FMLLog.log.debug("Received Mod Registry mapping for {}: {} IDs {} overrides {} dummied", pkt.getName(), entry.ids.size(), entry.overrides.size(), entry.dummied.size());
|
||||
return WAITINGSERVERCOMPLETE;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user