Merging branches 1 new mission type

2019-09-15 03:14:15 -05:00
parent c23d19435d
commit 8e238e2b48
210 changed files with 4507 additions and 4013 deletions
--- a/javadoc/com/massivecraft/factions/P.html
+++ b/javadoc/com/massivecraft/factions/P.html
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../com/massivecraft/factions/zcore/MPlugin.html" title="class in com.massivecraft.factions.zcore">com.massivecraft.factions.zcore.MPlugin</a></li>
 <li>
 <ul class="inheritance">
-    <li>com.massivecraft.factions.P</li>
+    <li>com.massivecraft.factions.FactionsPlugin</li>
 </ul>
 </li>
 </ul>