Merge remote-tracking branch 'runelite/master'

deobfuscator/src/main/java/net/runelite/asm/execution/StackContext.java

@@ -92,7 +92,7 @@ public class StackContext
 			return list;
 		
 		// remove from the stack things this instruction read
-		for (StackContext ctx : pushed.getPops()) 
+		for (StackContext ctx : pushed.getPops())
 			list.addAll(ctx.removeStack());
 		
 		return list;

deobfuscator/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java

@@ -151,7 +151,7 @@ public class IllegalStateExceptions implements Deobfuscator
 	
 	@Override
 	public void run(ClassGroup group)
-	{	
+	{
 		findInteresting(group);
 		
 		Execution execution = new Execution(group);

deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import net.runelite.asm.pool.Field;
 
 class Encryption
-{	
+{
 	private final Map<Field, Pair> fields = new HashMap<>();
 	
 	void addPair(Pair pair)

deobfuscator/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java

@@ -293,7 +293,7 @@ public class MultiplicationDeobfuscator implements Deobfuscator
 		
 		Collection<InstructionContext> ins = ctx.getFrame().getMethodCtx().getInstructonContexts(ctx.getInstruction());
 		for (InstructionContext i : ins)
-		{	
+		{
 			if (sctx == null)
 			{
 				if (!i.equals(ctx))

deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/MappingExecutorUtil.java

@@ -50,7 +50,7 @@ import net.runelite.asm.execution.Variables;
 import net.runelite.asm.signature.Signature;
 
 public class MappingExecutorUtil
-{	
+{
 	public static ParallelExecutorMapping map(Method m1, Method m2)
 	{
 		ClassGroup group1 = m1.getClassFile().getGroup();

deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java

@@ -61,7 +61,7 @@ public class UnusedParametersTest
 
 	@Test
 	public void testRun()
-	{	
+	{
 		RenameUnique r = new RenameUnique();
 		r.run(group);
 		r = null;