ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
13,480 Commits 1 Branch 0 Tags
1debe8a99b3a118f2f2a7451529c7bf1f757ead3
Commit Graph

55 Commits

Author SHA1 Message Date
Owain van Brakel
1debe8a99b Merge remote-tracking branch 'runelite/master' 2020-04-18 23:38:58 +02:00
RuneLite Cache-Code Autoupdater
a75c01e6c7 Update Item variations to 2020-04-16-rev182 2020-04-16 10:32:23 +00:00
kyle-escobar
3e2da6c375 Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-9-2020 
 Conflicts:
	runelite-client/src/main/java/net/runelite/client/RuneLite.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
	runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
	runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
	runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java
 2020-04-09 20:57:21 -04:00
RuneLite Cache-Code Autoupdater
e7fa298e24 Update Item variations to 2020-04-08-rev182 2020-04-08 10:32:23 +00:00
xKylee
b49c9d8b69 Merge branch 'pr/2' into upstream 2020-03-27 15:00:13 +00:00
RuneLite Cache-Code Autoupdater
8dbd589757 Update Item variations to 2020-03-26-rev182 2020-03-26 11:32:49 +00:00
Ganom
b2d7c7cfd0 Merge branch 'master' of https://github.com/runelite/runelite into upstream 
 Conflicts:
	runelite-api/src/main/java/net/runelite/api/Point.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
	runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeType.java
	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java
	runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
	runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampConfig.java
	runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java
	runelite-client/src/test/java/net/runelite/client/plugins/woodcutting/WoodcuttingPluginTest.java
 2020-03-05 07:31:50 -05:00
RuneLite Cache-Code Autoupdater
e1af1e06b1 Update Item variations to 2020-03-05-rev182 2020-03-05 11:33:08 +00:00
RuneLite Cache-Code Autoupdater
9c90c0931c ItemVariations: Add opened variants 2020-03-04 19:09:25 -07:00
xKylee
dfd9bf81f8 Merge branch 'pr/19' into upsteam3 2020-02-20 17:57:43 +00:00
RuneLite Cache-Code Autoupdater
5278f3634a Update Item variations to 2020-02-20-rev182 2020-02-20 11:33:07 +00:00
Kyle
4106b25932 Merge pull request #14 from runelite/master 
upstream: merge
 2020-02-07 13:43:48 +00:00
RuneLite Cache-Code Autoupdater
7fc0c4763c Update Item variations to 2020-02-06-rev182 2020-02-06 11:33:17 +00:00
Owain van Brakel
7f2f43364b Merge remote-tracking branch 'runelite/master' 2020-01-29 14:20:52 +01:00
RuneLite Cache-Code Autoupdater
318406384f Update Item variations to 2020-01-29-rev182 2020-01-29 05:12:14 -07:00
Owain van Brakel
132ac1eb07 Merge remote-tracking branch 'runelite/master' 2020-01-23 13:13:07 +01:00
RuneLite Cache-Code Autoupdater
342d36d014 Update Item variations to 2020-01-23-rev182 2020-01-23 11:33:08 +00:00
Owain van Brakel
740c2b135e Merge remote-tracking branch 'runelite/master' 2020-01-16 14:43:02 +01:00
RuneLite Cache-Code Autoupdater
8de499b442 Update Item variations to 2020-01-16-rev182 2020-01-16 11:34:00 +00:00
Owain van Brakel
dfaf72eb35 Merge remote-tracking branch 'runelite/master' into ready-set-action 
Conflicts:
	.gitignore
	cache-client/pom.xml
	cache-updater/pom.xml
	cache/pom.xml
	cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java
	deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java
	http-api/pom.xml
	http-service/pom.xml
	http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java
	pom.xml
	protocol-api/pom.xml
	protocol/pom.xml
	runelite-api/pom.xml
	runelite-api/src/main/java/net/runelite/api/Client.java
	runelite-client/pom.xml
	runelite-client/src/main/java/net/runelite/client/RuneLite.java
	runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
	runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
	runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
	runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
	runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java
	runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
	runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
	runelite-client/src/main/java/net/runelite/client/rs/CountingInputStream.java
	runelite-client/src/main/java/net/runelite/client/ui/FatalErrorDialog.java
	runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java
	runelite-client/src/main/java/net/runelite/client/util/CountingInputStream.java
	runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java
	runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
	runelite-client/src/main/resources/net/runelite/client/runelite.properties
	runelite-client/src/main/resources/npc_health.json
	runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
	runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
	runelite-script-assembler-plugin/pom.xml
 2020-01-09 19:59:46 +01:00
RuneLite Cache-Code Autoupdater
b808676797 Update Item variations to 2019-12-16-rev182 2019-12-23 17:30:32 -05:00
Owain van Brakel
eba140c8a5 Merge remote-tracking branch 'runelite/master' 2019-12-05 13:18:03 +01:00
RuneLite Cache-Code Autoupdater
cbdcc82c32 Update Item variations to 2019-12-05-rev182 2019-12-05 11:32:49 +00:00
Owain van Brakel
594d141d9b Merge remote-tracking branch 'runelite/master' 2019-11-28 21:31:34 +01:00
RuneLite Cache-Code Autoupdater
6ddab7029b Update Item variations to 2019-11-21-rev182 2019-11-21 11:32:50 +00:00
RuneLite Cache-Code Autoupdater
377f972198 Update Item variations to 2019-11-14-rev182 2019-11-14 12:07:49 +01:00
RuneLite Cache-Code Autoupdater
95220a4371 Update Item variations to 2019-11-14-rev182 2019-11-14 10:35:56 +00:00
Owain van Brakel
514bcdf93b Merge remote-tracking branch 'runelite/master' 2019-11-07 20:52:53 +01:00
RuneLite Cache-Code Autoupdater
fe51fe38a0 Update Item variations to 2019-11-07-rev182 2019-11-07 11:33:13 +00:00
Owain van Brakel
72258584f3 Merge remote-tracking branch 'runelite/master' 2019-10-31 18:57:12 +01:00
RuneLite Cache-Code Autoupdater
ef2b38c277 Update Item variations to 2019-10-31-rev182 2019-10-31 11:33:14 +00:00
Owain van Brakel
7005ab65c9 Merge remote-tracking branch 'runelite/master' into 1710-merge 2019-10-17 19:12:46 +02:00
RuneLite Cache-Code Autoupdater
7ea44dd0d1 Update Item variations to 2019-10-17-rev182 2019-10-17 10:32:58 +00:00
Lucwousin
f39c419882 minify jsons 2019-10-15 16:46:41 +02:00
Owain van Brakel
47d56f9d0a Merge remote-tracking branch 'runelite/master' into 1310-merge 2019-10-13 16:02:41 +02:00
RuneLite Cache-Code Autoupdater
c785109c20 Update Item variations to 2019-10-02-c1-rev182 2019-10-02 10:33:46 +00:00
Kyle Eldridge
b05f2833af upstream merge 
upstream merge
 2019-09-12 15:06:22 +01:00
RuneLite Cache-Code Autoupdater
4d4a4e064f Update Item variations to 2019-09-12-rev182 2019-09-12 10:55:20 +00:00
PKLite
8d0adb68c8 Merge branch 'master' of https://github.com/runelite/runelite into upstream 2019-08-29 06:58:24 -04:00
RuneLite Cache-Code Autoupdater
2e402edcbe Update Item variations to 2019-08-29-rev182 2019-08-29 10:33:09 +00:00
Owain van Brakel
b70140193a Merge remote-tracking branch 'runelite/master' into 0908-merge 2019-08-09 15:37:40 +02:00
RuneLite Cache-Code Autoupdater
e13e018316 Update Item variations to 2019-08-08-rev181 2019-08-08 10:33:31 +00:00
Crystalknoct
4f7f54bbea item_variations: added sote items (#1229) 
Added sote items from runelite
 2019-08-02 11:36:23 +01:00
RuneLite Cache-Code Autoupdater
04a27556ae Update Item variations to 2019-07-25-rev181 2019-07-25 09:33:31 +00:00
RuneLite Cache-Code Autoupdater
8516f15b3a Update Item variations to 2019-07-18-rev181 2019-07-18 10:32:35 +00:00
RuneLite Cache-Code Autoupdater
0944c0a4e6 Update Item variations to 2019-07-04-rev180 2019-07-08 11:38:55 -04:00
RuneLite Cache-Code Autoupdater
4b36918ba7 Update Item variations to 2019-06-20-rev180 2019-06-20 10:33:18 +00:00
RuneLite Cache-Code Autoupdater
2555c35736 Update Item variations to 2019-05-30-rev180 2019-05-30 10:33:10 +00:00
RuneLite Cache-Code Autoupdater
1241c7f918 Update Item variations to 2019-04-25-rev179 2019-04-25 04:36:45 -06:00
RuneLite Cache-Code Autoupdater
f97f4a3dc1 Update Item variations to 2019-04-11-rev179 2019-04-11 10:33:10 +00:00