Merge remote-tracking branch 'origin/vogog'

Conflicts:
	TwosideKeeper.jar

.gitignore

@@ -1,3 +1,4 @@
 .*
 /bin
 /projectBuilder.xml
+/TwosideKeeper.jar

.project

@@ -28,7 +28,7 @@
 		<link>
 			<name>jgrapht</name>
 			<type>2</type>
-			<location>D:/Data/jgrapht-1.0.1/jgrapht-1.0.1/source/jgrapht-core/src/main/java</location>
+			<location>C:/Applications/Eclipse.app/Contents/MacOS/D::/Data/jgrapht-1.0.1/jgrapht-1.0.1/source/jgrapht-core/src/main/java</location>
 		</link>
 	</linkedResources>
 </projectDescription>

projectBuilder.xml

@@ -3,6 +3,6 @@
 <project name="TwosideKeeper.makejar" default="makejar" basedir=".">
   <target name ="makejar" description="Create a jar for the TwosideKeeper project">
     <jar jarfile="TwosideKeeper.jar" includes="**/*.class,**/*.yml" basedir="bin"/>
-    <jar jarfile="D:\Documents\Test Server\plugins\TwosideKeeper.jar" includes="**/*.class,**/*.yml" basedir="bin"/>
+    <jar jarfile="D:/Documents/Test Server/plugins/TwosideKeeper.jar" includes="**/*.class,**/*.yml" basedir="bin"/>
   </target>
 </project>

src/sig/plugin/TwosideKeeper/CustomDamage.java

@@ -4285,9 +4285,9 @@ public class CustomDamage {
 		if (target!=null && shooter!=null && isBackstab(target,shooter) &&
 				(shooter instanceof Player) && PlayerMode.getPlayerMode((Player)shooter)==PlayerMode.SLAYER) {
 			if (ItemSet.meetsSlayerSwordConditions(ItemSet.ASSASSIN, 27, 3, (Player)shooter)) {
-				mult+=5.0;
+				mult+=7.0;
 			} else {
-				mult+=2.0;
+				mult+=3.0;
 			}
 			if (PVP.isPvPing((Player)shooter)) {
 				mult /= 3.0;

src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java

@@ -900,7 +900,7 @@ public enum ItemSet {
 					lore.add(ChatColor.WHITE+"    a backstab occurs."); 
 					if (tier>=3) {
 						lore.add(ChatColor.DARK_AQUA+" T27 - ");
-						lore.add(ChatColor.WHITE+"    Backstabs deal 6x normal damage."); 
+						lore.add(ChatColor.WHITE+"    Backstabs deal 8x normal damage."); 
 						if (tier>=4) {
 							lore.add(ChatColor.DARK_AQUA+" T40 - ");
 							lore.add(ChatColor.WHITE+"    +30% Cooldown Reduction"); 

src/sig/plugin/TwosideKeeper/HelperStructures/PlayerMode.java

@@ -93,7 +93,7 @@ public enum PlayerMode {
 					+ ChatColor.WHITE+"->Whenever a Slayer kills a target, they recover 1 Heart (2 HP). This can be modified by a special weapon.\n"
 					+ ChatColor.GRAY+"->Slayers can enter Stealth mode by pressing Sneak. Once in Stealth mode, Slayers will not leave stealth until they take damage or Sneak again. Stealth mode drains 1 Durability every second from tools on your hotbar.\n"
 					+ ChatColor.WHITE+"->While in Stealth mode, nothing will be able to detect you. Note this does not get rid of aggression from targets that have already aggro'd you.\n"
-					+ ChatColor.GRAY+"->Slayers can Backstab targets by getting behind them and hitting them. A backstab does triple the normal damage of an attack.\n"
+					+ ChatColor.GRAY+"->Slayers can Backstab targets by getting behind them and hitting them. A backstab does 4x the normal damage of an attack.\n"
 					+ ChatColor.WHITE+"->Whenever a Slayer critically strikes, it suppresses a target for 0.75 seconds. Suppression prevents movement, attacking, teleporting, and exploding. Suppressed targets glow Black.\n"
 					+ ChatColor.GRAY+"->Slayers thrive in 1vs1 situations. If a target is completely alone, they will glow white to the Slayer. Isolated targets take 50% more damage from the Slayer. Slayer's Dodge Chance increases by 40% against isolated targets.\n"
 					+ ChatColor.WHITE+"->Slayers can use the Assassination ability. Press the Drop key while looking at an enemy to perform an assassination: You jump directly behind the enemy, gaining 0.5 seconds of invulnerability. If the next hit after Assassination is performed kills the target, you gain a speed and strength buff. These buffs cap at Speed V and Strength X respectively and last 10 seconds. Assassination cooldown is reset whenever a target is instantly killed in this manner, and you get immediately put back into stealth, preventing further detection from other monsters.\n"),