project: Merge upstream

2019-07-16 17:23:46 +02:00
parent ef6ea5b18f 4ac7c33f47
commit c6a8450619
48 changed files with 559 additions and 217 deletions
--- a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
+++ b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
@@ -11,9 +11,9 @@
   iconst                 0
   iload                  0
   iconst                 25
-   sconst            	  "scrollWheelZoomIncrement"
+   sconst                 "scrollWheelZoomIncrement"
   runelite_callback
-   multiply
+   multiply              
   sub
   istore                 1
   iconst                 512