Merge branch 'master' into quest

README.md

@@ -22,21 +22,21 @@
 - [runescape-api](runescape-api/src/main/java/net/runelite) - Mappings correspond to these interfaces, runelite-api is a subset of this
 - [runelite-client](runelite-client/src/main/java/net/runelite/client) - Game client with plugins
 
+## Building
+We have migrated the project to Gradle. Information on how to setup and build the project can be found at https://github.com/runelite-extended/runelite/wiki/Building-with-IntelliJ-IDEA
+
 ## Private Servers
 Currently we support RSMod which can be found at: https://github.com/Tomm0017/rsmod but should work with any server that follows osrs protocol.
 ```
 Jar/IntelliJ
-Use -private-server arg.
+Use -rs=RSPS arg.
 
 Exe
-Use --clientargs="--private-server" arg.
-
-Using modified mixins is possible using -local-injected arg, but it looks in a very specific location. 
-(./injected-client/target/injected-client-X.X.XX-SNAPSHOT.jar) (X.X.XX must match current API version)
+Use --clientargs="--rs=RSPS" arg.
 
 -----
 
-Set codebase in ./codebase or in Private Server plugin and restart.  
+Codebase is set to 127.0.0.1 by default and can be changed in the Private Server plugin (requires restart) 
 Update modulus in Private Server plugin. 
     
 Disable Default World plugin if you have it enabled, this causes issues with codebase.