Skip to content

Commit

Permalink
Merge remote-tracking branch 'orig_upstream/master' into ext
Browse files Browse the repository at this point in the history
  • Loading branch information
@LostWorlds
LostWorlds committed Apr 25, 2019
2 parents 5c69492 + 6f6832d commit 5b77d64
Show file tree
Hide file tree
Showing 26 changed files with 941 additions and 948 deletions.
2 changes: 1 addition & 1 deletion cache-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>

<artifactId>cache-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cache-updater/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>

<name>Cache Updater</name>
Expand Down
2 changes: 1 addition & 1 deletion cache/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>

<artifactId>cache</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion http-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>

<name>Web API</name>
Expand Down
2 changes: 1 addition & 1 deletion http-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>

<name>Web Service</name>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
<packaging>pom</packaging>

<name>RuneLite</name>
Expand Down
2 changes: 1 addition & 1 deletion protocol-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>

<artifactId>protocol-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion protocol/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>

<artifactId>protocol</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion runelite-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>

<artifactId>runelite-api</artifactId>
Expand Down
9 changes: 0 additions & 9 deletions runelite-api/src/main/java/net/runelite/api/ItemID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10321,7 +10321,6 @@ public final class ItemID
public static final int STARTER_SWORD = 22331;
public static final int STARTER_BOW = 22333;
public static final int STARTER_STAFF = 22335;
public static final int KINDLING_22350 = 22350;
public static final int EGGSHELL_PLATEBODY = 22351;
public static final int EGGSHELL_PLATELEGS = 22353;
public static final int HOLY_HANDEGG = 22355;
Expand Down Expand Up @@ -10792,13 +10791,5 @@ public final class ItemID
public static final int TORMENTED_BRACELET_OR = 23444;
public static final int GIANT_EASTER_EGG = 23446;
public static final int BUNNYMAN_MASK = 23448;
public static final int DRIED_COCOA = 23450;
public static final int HOSIDIUS_MILK = 23451;
public static final int SPECIAL_SPICES = 23452;
public static final int CRATE_OF_BASKETS = 23453;
public static final int FINE_SILK = 23454;
public static final int FINE_RED_SILK = 23455;
public static final int CHOCOLATE_MIXTUREU = 23456;
public static final int CHOCO_SERUM = 23457;
/* This file is automatically generated. Do not edit. */
}
23 changes: 1 addition & 22 deletions runelite-api/src/main/java/net/runelite/api/NpcID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7847,27 +7847,6 @@ public final class NpcID
public static final int DODGY_GEEZER = 8644;
public static final int ARTHUR_THE_CLUE_HUNTER = 8665;
public static final int BANKER_8666 = 8666;
public static final int EASTER_BUNNY = 8667;
public static final int CHOCCO = 8668;
public static final int MILKEE = 8669;
public static final int GOLDIE = 8670;
public static final int RABBIT_8671 = 8671;
public static final int BUGS_8672 = 8672;
public static final int CAERBANNOG = 8673;
public static final int BUNNY_MAN = 8674;
public static final int PETER_8675 = 8675;
public static final int CHOCOLATE_CHICKEN = 8676;
public static final int CHOCOLATE_CHICKEN_8677 = 8677;
public static final int CHOCOLATE_CHICKEN_8678 = 8678;
public static final int COLOSSAL_CHOCCO_CHICKEN = 8679;
public static final int COLOSSAL_CHOCCO_CHICKEN_8680 = 8680;
public static final int COLOSSAL_CHOCCO_CHICKEN_8681 = 8681;
public static final int COLOSSAL_CHOCCO_CHICKEN_8682 = 8682;
public static final int CHOCOLATE_CHICKEN_8683 = 8683;
public static final int EASTER_BUNNY_8684 = 8684;
public static final int EG = 8685;
public static final int EGG_8686 = 8686;
public static final int EGGY = 8687;
public static final int TRAVELLING_MERCHANT = 8694;
public static final int MOSOL_REI_8696 = 8696;
/* This file is automatically generated. Do not edit. */
}
9 changes: 9 additions & 0 deletions runelite-api/src/main/java/net/runelite/api/NullItemID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11842,6 +11842,7 @@ public final class NullItemID
public static final int NULL_22347 = 22347;
public static final int NULL_22348 = 22348;
public static final int NULL_22349 = 22349;
public static final int NULL_22350 = 22350;
public static final int NULL_22352 = 22352;
public static final int NULL_22354 = 22354;
public static final int NULL_22356 = 22356;
Expand Down Expand Up @@ -12447,5 +12448,13 @@ public final class NullItemID
public static final int NULL_23445 = 23445;
public static final int NULL_23447 = 23447;
public static final int NULL_23449 = 23449;
public static final int NULL_23450 = 23450;
public static final int NULL_23451 = 23451;
public static final int NULL_23452 = 23452;
public static final int NULL_23453 = 23453;
public static final int NULL_23454 = 23454;
public static final int NULL_23455 = 23455;
public static final int NULL_23456 = 23456;
public static final int NULL_23457 = 23457;
/* This file is automatically generated. Do not edit. */
}
49 changes: 0 additions & 49 deletions runelite-api/src/main/java/net/runelite/api/NullObjectID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16154,54 +16154,5 @@ public final class NullObjectID
public static final int NULL_34738 = 34738;
public static final int NULL_34739 = 34739;
public static final int NULL_34740 = 34740;
public static final int NULL_34750 = 34750;
public static final int NULL_34751 = 34751;
public static final int NULL_34752 = 34752;
public static final int NULL_34753 = 34753;
public static final int NULL_34754 = 34754;
public static final int NULL_34755 = 34755;
public static final int NULL_34756 = 34756;
public static final int NULL_34758 = 34758;
public static final int NULL_34759 = 34759;
public static final int NULL_34760 = 34760;
public static final int NULL_34763 = 34763;
public static final int NULL_34764 = 34764;
public static final int NULL_34765 = 34765;
public static final int NULL_34766 = 34766;
public static final int NULL_34767 = 34767;
public static final int NULL_34768 = 34768;
public static final int NULL_34769 = 34769;
public static final int NULL_34770 = 34770;
public static final int NULL_34771 = 34771;
public static final int NULL_34772 = 34772;
public static final int NULL_34773 = 34773;
public static final int NULL_34774 = 34774;
public static final int NULL_34775 = 34775;
public static final int NULL_34776 = 34776;
public static final int NULL_34777 = 34777;
public static final int NULL_34778 = 34778;
public static final int NULL_34779 = 34779;
public static final int NULL_34781 = 34781;
public static final int NULL_34782 = 34782;
public static final int NULL_34784 = 34784;
public static final int NULL_34785 = 34785;
public static final int NULL_34786 = 34786;
public static final int NULL_34789 = 34789;
public static final int NULL_34790 = 34790;
public static final int NULL_34799 = 34799;
public static final int NULL_34800 = 34800;
public static final int NULL_34801 = 34801;
public static final int NULL_34802 = 34802;
public static final int NULL_34809 = 34809;
public static final int NULL_34810 = 34810;
public static final int NULL_34811 = 34811;
public static final int NULL_34815 = 34815;
public static final int NULL_34816 = 34816;
public static final int NULL_34817 = 34817;
public static final int NULL_34818 = 34818;
public static final int NULL_34819 = 34819;
public static final int NULL_34838 = 34838;
public static final int NULL_34839 = 34839;
public static final int NULL_34840 = 34840;
/* This file is automatically generated. Do not edit. */
}
51 changes: 0 additions & 51 deletions runelite-api/src/main/java/net/runelite/api/ObjectID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18575,56 +18575,5 @@ public final class ObjectID
public static final int STRANGE_CASKET = 34733;
public static final int INCONSPICUOUS_BUSH_BEGINNER = 34734;
public static final int STASH_BEGINNER = 34735;
public static final int RABBIT_HOLE_34741 = 34741;
public static final int RABBIT_HOLE_34742 = 34742;
public static final int RABBIT_HOLE_34743 = 34743;
public static final int RABBIT_HOLE_34744 = 34744;
public static final int RABBIT_HOLE_34745 = 34745;
public static final int RABBIT_HOLE_34746 = 34746;
public static final int RABBIT_HOLE_34747 = 34747;
public static final int RABBIT_HOLE_34748 = 34748;
public static final int RABBIT_HOLE_34749 = 34749;
public static final int CHOCOLATE_DEPOSIT = 34757;
public static final int TUNNEL_34761 = 34761;
public static final int TUNNEL_34762 = 34762;
public static final int PIPES_34780 = 34780;
public static final int PIPES_34783 = 34783;
public static final int BREWING_VAT_34787 = 34787;
public static final int OUTPUT_TAP_34788 = 34788;
public static final int ROCK_SUPPORT = 34791;
public static final int WOODEN_SUPPORT = 34792;
public static final int NEST_GATE = 34793;
public static final int NEST_34794 = 34794;
public static final int NEST_34795 = 34795;
public static final int NEST_34796 = 34796;
public static final int NEST_34797 = 34797;
public static final int NEST_34798 = 34798;
public static final int VAT_34803 = 34803;
public static final int VAT_34804 = 34804;
public static final int SWEET_SHELF = 34805;
public static final int CRATE_34806 = 34806;
public static final int CRATE_34807 = 34807;
public static final int CRATE_34808 = 34808;
public static final int HOLE_34812 = 34812;
public static final int EGG_CUP = 34813;
public static final int EGG_CUP_34814 = 34814;
public static final int PLATFORM_34820 = 34820;
public static final int ROPE_34821 = 34821;
public static final int ROPE_34822 = 34822;
public static final int ROPE_34823 = 34823;
public static final int ROPE_34824 = 34824;
public static final int EASTER_EGG = 34825;
public static final int EGG_MOLD = 34826;
public static final int COOKING_RANGE_34827 = 34827;
public static final int BRONZE_PICKAXE_34828 = 34828;
public static final int BRONZE_AXE_34829 = 34829;
public static final int TINDERBOX_34830 = 34830;
public static final int CABBAGE_34831 = 34831;
public static final int PUDDLE_OF_VOMIT = 34832;
public static final int BURROW_34833 = 34833;
public static final int BURROW_34834 = 34834;
public static final int BURROW_34835 = 34835;
public static final int BURROW_34836 = 34836;
public static final int AGGIES_TOMATO = 34837;
/* This file is automatically generated. Do not edit. */
}
Loading

0 comments on commit 5b77d64

Please sign in to comment.