Lucas
9a4d37d7bb
Merge remote-tracking branch 'ext_upstream/master' into master3
# Conflicts:
# deobfuscator/pom.xml
# deobfuscator/src/main/java/net/runelite/asm/attributes/Exceptions.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/annotation/Element.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/code/InstructionType.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java
# deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java
# deobfuscator/src/main/java/net/runelite/asm/pool/Class.java
# deobfuscator/src/main/java/net/runelite/asm/pool/Field.java
# deobfuscator/src/main/java/net/runelite/deob/Deob.java
# deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java
# deobfuscator/src/main/java/net/runelite/deob/clientver/VersionClassVisitor.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/MapKey.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ConstructorMapper.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java
# deobfuscator/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java
# deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.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/asm/execution/tests/TableSwitch.java
# deobfuscator/src/test/java/net/runelite/asm/signature/SignatureTest.java
# deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java
# deobfuscator/src/test/java/net/runelite/deob/TemporyFolderLocation.java
# deobfuscator/src/test/java/net/runelite/deob/clientver/ClientVersionTest.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/RuneliteBufferTest.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/ClassA.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java
# deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyInterface.java
# deobfuscator/src/test/java/net/runelite/osb/inject/FieldHook.java
# injected-client/pom.xml
# injector-plugin/pom.xml
# injector-plugin/src/main/java/net/runelite/injector/Inject.java
# injector-plugin/src/main/java/net/runelite/injector/InjectMojo.java
# injector-plugin/src/main/java/net/runelite/injector/InjectionException.java
# injector-plugin/src/main/java/net/runelite/injector/MixinInjector.java
# injector-plugin/src/main/java/net/runelite/injector/raw/ClearColorBuffer.java
# injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java
# injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java
# pom.xml
# runelite-api/src/main/java/net/runelite/api/Actor.java
# runelite-api/src/main/java/net/runelite/api/Client.java
# runelite-api/src/main/java/net/runelite/api/CollisionData.java
# runelite-api/src/main/java/net/runelite/api/EquipmentInventorySlot.java
# runelite-api/src/main/java/net/runelite/api/NPCDefinition.java
# runelite-api/src/main/java/net/runelite/api/Perspective.java
# runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
# runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
# runelite-api/src/main/java/net/runelite/api/events/GraphicChanged.java
# runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
# runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
# runelite-api/src/main/java/net/runelite/api/events/PostItemDefinition.java
# runelite-api/src/main/java/net/runelite/api/events/SpotAnimationChanged.java
# runelite-api/src/main/java/net/runelite/api/vars/AccountType.java
# runelite-api/src/main/java/net/runelite/mapping/Construct.java
# runelite-api/src/main/java/net/runelite/mapping/Hook.java
# runelite-api/src/main/java/net/runelite/mapping/Implements.java
# runelite-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
# runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
# runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
# runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
# runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java
# runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java
# runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
# runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
# runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java
# runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java
# runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSMessageMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java
# runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java
# runescape-api/src/main/java/net/runelite/mapping/Implements.java
# runescape-api/src/main/java/net/runelite/mapping/ObfuscatedSignature.java
# runescape-api/src/main/java/net/runelite/rs/api/RSBufferProvider.java
# runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
# runescape-api/src/main/java/net/runelite/rs/api/RSCollisionData.java
# runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfo1.java
# runescape-api/src/main/java/net/runelite/rs/api/RSCombatInfoListHolder.java
# runescape-api/src/main/java/net/runelite/rs/api/RSDecorativeObject.java
# runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java
# runescape-api/src/main/java/net/runelite/rs/api/RSGameShell.java
# runescape-api/src/main/java/net/runelite/rs/api/RSGroundObject.java
# runescape-api/src/main/java/net/runelite/rs/api/RSItem.java
# runescape-api/src/main/java/net/runelite/rs/api/RSItemLayer.java
# runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeDeque.java
# runescape-api/src/main/java/net/runelite/rs/api/RSJagexLoginType.java
# runescape-api/src/main/java/net/runelite/rs/api/RSKeyHandler.java
# runescape-api/src/main/java/net/runelite/rs/api/RSMainBufferProvider.java
# runescape-api/src/main/java/net/runelite/rs/api/RSMapElementConfig.java
# runescape-api/src/main/java/net/runelite/rs/api/RSMessage.java
# runescape-api/src/main/java/net/runelite/rs/api/RSMessageNode.java
# runescape-api/src/main/java/net/runelite/rs/api/RSModel.java
# runescape-api/src/main/java/net/runelite/rs/api/RSPlayerComposition.java
# runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java
# runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java
# runescape-api/src/main/java/net/runelite/rs/api/RSSpritePixels.java
# runescape-api/src/main/java/net/runelite/rs/api/RSWallObject.java
# runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java
2019-06-08 23:06:59 +02:00
..
2019-06-08 23:06:59 +02:00
2019-06-08 23:06:59 +02:00