Commit Graph

6 Commits

Author SHA1 Message Date
ThatGamerBlue
29a3d313a4 rev 196 2021-05-19 12:59:30 +01:00
ThatGamerBlue
c9d40d93dd project: rev 195 2021-04-14 13:14:08 +01:00
ThatGamerBlue
563587e6b0 rsc: please read the commit message for my neverending descent into madness
how do i stop making castles
every time i go to the beach i make a castle
every time i open blender i model castles
every time i play chess i castle
i just cant stop making castles dude
2021-02-26 00:33:45 +00:00
zeruth
e1df0f6f7c chore: rev 194 2021-02-24 08:08:39 -05:00
ThatGamerBlue
925f0f54e2 fix naming inconsistency 2021-02-08 17:09:56 +00:00
zeruth
7b0678d0a1 Merge branch 'upstream-master' into runelite
# 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/Client.java
#	runelite-api/src/main/java/net/runelite/api/events/MenuEntryAdded.java
#	runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PlayerMenuOptionClicked.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-script-assembler-plugin/pom.xml
2021-01-29 21:19:28 -05:00