Merge branch 'runelite' of https://github.com/Noodleeater/runelite into runeLite_personal

 Conflicts:
	runelite-api/src/main/java/net/runelite/api/Client.java
	runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java
This commit is contained in:
Noodleeater
2021-02-20 22:00:17 +00:00
3 changed files with 10 additions and 3 deletions

View File

@@ -376,8 +376,6 @@ public interface Client extends GameEngine
*/
int getPlane();
void setPlane(int plane);
/**
* Gets the current scene
*/
@@ -2114,6 +2112,8 @@ public interface Client extends GameEngine
*/
Frames getFrames(int frameId);
SequenceDefinition getSequenceDefinition(int id);
/**
* various archives you might want to use for reading data from cache
*/