Commit Graph

125 Commits

Author SHA1 Message Date
ThatGamerBlue
47583ab7c6 bump version numbers 2020-10-21 13:56:51 +02:00
Owain van Brakel
1cf50d54b1 project: Merge upstream 2020-10-21 12:57:38 +02:00
ThatGamerBlue
f627100932 Merge remote-tracking branch 'runelite/master' into aaaaaaaaaaaaaaaaaaaaaaaaaaa 2020-09-19 16:24:07 +01:00
ThatGamerBlue
83bdef6706 bump versions 2020-09-08 18:58:11 +01:00
Owain van Brakel
6d342d7abc Merge remote-tracking branch 'runelite/master' into master 2020-08-28 03:17:10 +02:00
ThatGamerBlue
b6ea56781c rsclient: rev 191 2020-08-26 21:11:23 +01:00
ThatGamerBlue
106de31a9d deobber: fixes 2020-08-26 21:01:24 +01:00
Owain van Brakel
f7a055fa5a Merge remote-tracking branch 'runelite/master' 2020-08-11 01:16:03 +02:00
ThatGamerBlue
7b261b0cc7 Merge remote-tracking branch 'runelite/master' into 23072020
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpots.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.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/FaloTheBardClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/dpscounter/DpsCounterPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
#	runelite-client/src/test/java/net/runelite/client/plugins/itemstats/ItemStatOverlayTest.java
#	runelite-script-assembler-plugin/pom.xml
2020-07-23 15:07:56 +01:00
Owain van Brakel
3fad382843 bootstrap: Fix client not being copied over 2020-07-17 07:51:48 +02:00
ThatGamerBlue
3ca8b40310 bump version number 2020-07-17 00:50:15 +01:00
ThatGamerBlue
9fc44d80de Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-client/pom.xml
#	runelite-script-assembler-plugin/pom.xml
2020-07-16 18:38:55 +01:00
Lucwousin
cdf597a1ef lazy resolve bootstrap deps 2020-06-27 19:08:52 +02:00
Owain van Brakel
80c606b6ce project: Bump OpenOSRS version 2020-06-25 19:03:02 +02:00
Owain van Brakel
151a3e7119 Merge remote-tracking branch 'runelite/master' 2020-06-25 19:01:09 +02:00
Owain van Brakel
2ac53f44bd Merge remote-tracking branch 'origin/master' 2020-06-18 13:33:19 +02:00
Owain van Brakel
60c016f0aa Merge remote-tracking branch 'runelite/master' 2020-06-18 13:33:15 +02:00
Owain van Brakel
757130215f Merge remote-tracking branch 'runelite/master' 2020-06-18 13:32:31 +02:00
ThatGamerBlue
655106b9df chore: rev 190 2020-06-18 12:15:38 +01:00
Owain van Brakel
72b7514b2e Merge remote-tracking branch 'runelite/master' 2020-06-13 04:51:09 +02:00
Owain van Brakel
502b07d50d project: Bump OpenOSRS version 2020-06-04 16:49:45 +02:00
Owain van Brakel
d8da4f08e9 Merge remote-tracking branch 'runelite/master' 2020-06-04 16:49:24 +02:00
Owain van Brakel
90090d55e1 Merge remote-tracking branch 'runelite/master' 2020-05-28 15:17:41 +02:00
Owain van Brakel
99af99cf32 Merge pull request #2623 from Owain94/NameableContainer 2020-05-26 00:44:33 +02:00
Owain van Brakel
228deaabc6 project: Bump client version 2020-05-25 21:56:41 +02:00
Owain van Brakel
61cb0ced3a bootstrap: Checkstyle 2020-05-25 05:02:36 +02:00
Owain van Brakel
88f7b9a9ed Revert "bootstrap: Download rxrelay from the OpenOSRS hosting repo"
This reverts commit 6fa6ab4c8e.
2020-05-25 04:56:45 +02:00
Owain van Brakel
077917ffde Merge remote-tracking branch 'runelite/master' 2020-05-21 13:49:10 +02:00
Owain van Brakel
e690df0852 Merge remote-tracking branch 'runelite/master' 2020-05-21 13:34:48 +02:00
Owain van Brakel
98e3351b6e Merge remote-tracking branch 'runelite/master' 2020-05-14 17:58:01 +02:00
Owain van Brakel
af1cd9aba8 project: Bump versions 2020-05-13 18:49:33 +02:00
Owain van Brakel
04188f2d82 Merge remote-tracking branch 'runelite/master' 2020-05-01 20:08:11 +02:00
Owain van Brakel
41508a74fe project: Use latest injector 2020-05-01 13:35:18 +02:00
Owain van Brakel
d85c76bebe project: Bump version 2020-05-01 10:48:56 +02:00
Kyle
8216dfa20f upstream: merge and version bump
upstream: merge and version bump
2020-04-25 23:53:09 +01:00
ThatGamerBlue
ed923ebc0b bootstrap: allow java up to 1g of ram 2020-04-23 16:24:25 +01:00
Owain van Brakel
1debe8a99b Merge remote-tracking branch 'runelite/master' 2020-04-18 23:38:58 +02:00
Owain van Brakel
3c1e04d147 project: Let CI handle dependencies 2020-04-08 17:11:17 +02:00
Owain van Brakel
53051325e1 project: Bump OpenOSRS version 2020-03-27 21:21:45 +01:00
Owain van Brakel
9384390755 project: Bump RL version 2020-03-27 21:21:25 +01:00
Owain van Brakel
3ecdebf542 project: Rework external plugins, local instances syncing, hotswapping 2020-03-27 21:17:20 +01:00
ThatGamerBlue
acd339fd70 chore: revision 189 2020-03-26 14:17:06 +00:00
Owain van Brakel
82555d4064 project: Update deps 2020-03-18 13:09:20 +01:00
Owain van Brakel
6987d28538 sentry: Fix logging 2020-03-13 12:15:07 +01:00
Owain van Brakel
6fa6ab4c8e bootstrap: Download rxrelay from the OpenOSRS hosting repo 2020-03-11 12:36:35 +01:00
Owain van Brakel
d0e745619d project: Bump version 2020-03-11 11:23:07 +01:00
Owain van Brakel
cb0995f037 project: Update to RxJava 3 2020-03-11 11:20:21 +01:00
Owain van Brakel
b9e55b5f76 project: Update dependencies 2020-03-10 13:56:45 +01:00
Owain van Brakel
a081cc8c98 bootstrap: Look for OpenOSRS version 2020-03-10 12:00:09 +01:00
Ganom
b0f1e85c2e project: upstream fixes. 2020-03-05 07:37:01 -05:00