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/resources/net/runelite/client/plugins/grandexchange/ge_limits.json
+++ b/runelite-client/src/main/resources/net/runelite/client/plugins/grandexchange/ge_limits.json
@@ -3088,6 +3088,7 @@
  "19627": 10000,
  "19629": 10000,
  "19631": 10000,
+  "19653": 100,
  "19656": 13000,
  "19662": 10000,
  "19665": 13000,