Merge branch 'master' of https://github.com/runelite/runelite into upstream-03012022
Conflicts: README.md cache-client/pom.xml cache-updater/pom.xml cache/pom.xml cache/src/test/java/net/runelite/cache/SpritePixelsManagerTest.java config/checkstyle/checkstyle.xml config/checkstyle/suppressions.xml deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java deobfuscator/src/main/java/net/runelite/asm/pool/Class.java deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java deobfuscator/src/test/java/net/runelite/asm/annotations/MyAnnotation.java deobfuscator/src/test/java/net/runelite/asm/execution/mapper/StaticStepTest.java deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinderTest.java deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/ClassA.java deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java http-api/src/main/java/net/runelite/http/api/item/ItemStats.java http-api/src/main/resources/runelite.properties injection-annotations/src/main/java/net/runelite/api/mixins/Mixins.java pom.xml runelite-api/pom.xml runelite-api/src/main/java/net/runelite/api/Frames.java runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java runelite-api/src/main/java/net/runelite/api/events/PlayerSkullChanged.java runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java runelite-api/src/main/java/net/runelite/api/util/JagexPrintableCharMatcher.java runelite-client/pom.xml runelite-client/src/main/java/com/openosrs/client/events/OPRSPluginChanged.java runelite-client/src/main/java/com/openosrs/client/events/OPRSRepositoryChanged.java runelite-client/src/main/java/com/openosrs/client/game/AttackStyle.java runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java runelite-client/src/main/java/net/runelite/client/RuneLite.java runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java runelite-client/src/main/java/net/runelite/client/SessionClient.java runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java runelite-client/src/main/java/net/runelite/client/game/ItemClient.java runelite-client/src/main/java/net/runelite/client/game/ItemManager.java runelite-client/src/main/java/net/runelite/client/game/WorldService.java runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpData.java runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaClient.java runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java runelite-client/src/main/resources/net/runelite/client/runelite.properties runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java runelite-jshell/pom.xml runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java runelite-script-assembler-plugin/pom.xml runescape-api/src/main/java/net/runelite/rs/api/RSAbstractRasterProvider.java runescape-api/src/main/java/net/runelite/rs/api/RSDecimator.java runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java runescape-api/src/main/java/net/runelite/rs/api/RSUsername.java runescape-client/src/test/java/ISAACCipherTest.java
This commit is contained in:
@@ -29,7 +29,6 @@
|
||||
"https://checkstyle.org/dtds/configuration_1_3.dtd">
|
||||
<module name="Checker">
|
||||
<module name="TreeWalker">
|
||||
<module name="SuppressionCommentFilter"/>
|
||||
<module name="LeftCurly">
|
||||
<property name="option" value="nl"/>
|
||||
<!-- allow {} on anonymous classes and lambdas-->
|
||||
@@ -61,7 +60,4 @@
|
||||
<property name="format" value="else[ \t]*[\r\n]+[ \t]*if"/>
|
||||
<property name="message" value="Newline should not be between else and if"/>
|
||||
</module>
|
||||
<module name="SuppressionFilter">
|
||||
<property name="file" value="${config_loc}/suppressions.xml"/>
|
||||
</module>
|
||||
</module>
|
||||
|
||||
Reference in New Issue
Block a user