ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Upstream/master' into runelite-master

Browse Source 
Still needs mixins fixed. so do not merge yet.

# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
This commit is contained in:
Zeruth
2019-07-10 20:06:09 -04:00
parent e7b15d9cfd d39bfcb50f
commit 65c1794c2b
18 changed files with 1436 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-api/src/main/java/net/runelite/api/AnimationID.java
View File

@@ -197,6 +197,7 @@ public final class AnimationID
public static final int FARMING_PLANT_SEED = 2291;
public static final int FARMING_HARVEST_FLOWER = 2292;
public static final int FARMING_MIX_ULTRACOMPOST = 7699;
public static final int FARMING_HARVEST_ALLOTMENT = 830;
// Lunar spellbook
public static final int ENERGY_TRANSFER_VENGEANCE_OTHER = 4411;

5
runelite-api/src/main/java/net/runelite/api/events/ItemContainerChanged.java
View File

@@ -41,6 +41,11 @@ import lombok.Value;
@Value
public class ItemContainerChanged
{
/**
* The modified container's ID.
*/
private final int containerId;
/**
* The modified item container.
*/