Merge branch 'master' into bukkit

This commit is contained in:
Christian Weeks 2012-04-15 21:58:18 -04:00
commit 9fb72398b5

View file

@ -73,9 +73,11 @@ public class ModSorter
else
{
modGraph.addEdge(before, mod);
if (nameLookup.containsKey(dep)) {
modGraph.addEdge(nameLookup.get(dep), mod);
}
}
}
for (String dep : mod.getPostDepends())
{
@ -91,9 +93,11 @@ public class ModSorter
else
{
modGraph.addEdge(mod, after);
if (nameLookup.containsKey(dep)) {
modGraph.addEdge(mod, nameLookup.get(dep));
}
}
}
if (!preDepAdded)
{