various: upstream and version bump

This commit is contained in:
TheRealNull
2021-01-10 12:20:13 -05:00
parent e440cad52f
commit 5830575dcc
6 changed files with 6 additions and 4 deletions

View File

@@ -25,7 +25,7 @@
object ProjectVersions { object ProjectVersions {
const val launcherVersion = "2.2.0" const val launcherVersion = "2.2.0"
const val rlVersion = "1.6.35" const val rlVersion = "1.6.36"
const val openosrsVersion = "3.5.4" const val openosrsVersion = "3.5.4"

View File

@@ -45,4 +45,4 @@ public class GrandExchangeTrade
private WorldType worldType; private WorldType worldType;
private int seq; private int seq;
private Instant resetTime; private Instant resetTime;
} }

View File

@@ -279,4 +279,4 @@ public class HiscoreResult
throw new IllegalArgumentException("Invalid hiscore skill"); throw new IllegalArgumentException("Invalid hiscore skill");
} }
} }
} }

View File

@@ -87,6 +87,7 @@ class HiscoreResultBuilder
hiscoreResult.setClueScrollElite(skills.get(index++)); hiscoreResult.setClueScrollElite(skills.get(index++));
hiscoreResult.setClueScrollMaster(skills.get(index++)); hiscoreResult.setClueScrollMaster(skills.get(index++));
hiscoreResult.setLastManStanding(skills.get(index++)); hiscoreResult.setLastManStanding(skills.get(index++));
hiscoreResult.setSoulWarsZeal(skills.get(index++));
// seasonal doesn't have boss hiscores // seasonal doesn't have boss hiscores
if (index < skills.size()) if (index < skills.size())
{ {

View File

@@ -117,4 +117,4 @@ public enum HiscoreSkill
private final String name; private final String name;
private final HiscoreSkillType type; private final HiscoreSkillType type;
} }

View File

@@ -76,6 +76,7 @@ class PluginListPanel extends PluginPanel
private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value(); private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value();
private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins"; private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins";
private static final ImmutableList<String> CATEGORY_TAGS = ImmutableList.of( private static final ImmutableList<String> CATEGORY_TAGS = ImmutableList.of(
"OpenOSRS",
"Combat", "Combat",
"Chat", "Chat",
"Item", "Item",