project: Fix upstream merge (#1157)

* Fix upstream merge * Update RSItemContainerMixin.java
2019-07-28 00:05:55 +02:00
parent 9ed6f586dd
commit 22f6146ea7
25 changed files with 3548 additions and 520 deletions
--- a/runescape-client/src/main/java/Timer.java
+++ b/runescape-client/src/main/java/Timer.java
@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

@ObfuscatedName("jr")
-@Implements("Timer") //GroundItem
+@Implements("Timer")
 public class Timer {
 	@ObfuscatedName("q")
 	@ObfuscatedGetter(