Skip to content

Commit

Permalink
Merge branch 'main' into asset-log
Browse files Browse the repository at this point in the history
  • Loading branch information
@GoldenGnu
GoldenGnu committed Dec 7, 2024
2 parents fac6362 + c040aec commit 34520a1
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion data/data.dat
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-11-12
2024-12-07
68 changes: 34 additions & 34 deletions data/items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108020,39 +108020,39 @@
<row capacity="92.0" category="Entity" group="Insurgency Pirate Battleship" id="79709" marketgroup="false" meta="0" name="Guristas Ransomer Rattlesnake" pi="false" portion="1" price="0" product="0" tech="Faction" volume="18000.0"/>
<row capacity="92.0" category="Entity" group="Insurgency Pirate Battleship" id="79710" marketgroup="false" meta="0" name="Guristas Ransomer Rattlesnake" pi="false" portion="1" price="0" product="0" tech="Faction" volume="18000.0"/>
<row capacity="92.0" category="Entity" group="Insurgency Pirate Battleship" id="79711" marketgroup="false" meta="0" name="Guristas Ransomer Rattlesnake" pi="false" portion="1" price="0" product="0" tech="Faction" volume="18000.0"/>
<row category="SKINs" group="Permanent SKIN" id="79713" marketgroup="false" meta="0" name="Tormentor Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79714" marketgroup="false" meta="0" name="Dragoon Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79715" marketgroup="false" meta="0" name="Arbitrator Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79713" marketgroup="true" meta="0" name="Tormentor Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79714" marketgroup="true" meta="0" name="Dragoon Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79715" marketgroup="true" meta="0" name="Arbitrator Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79716" marketgroup="true" meta="0" name="Archon Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79717" marketgroup="false" meta="0" name="Harpy Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79717" marketgroup="true" meta="0" name="Harpy Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79718" marketgroup="true" meta="0" name="Corax Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79719" marketgroup="false" meta="0" name="Stork Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79720" marketgroup="false" meta="0" name="Blackbird Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79721" marketgroup="false" meta="0" name="Rook Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79719" marketgroup="true" meta="0" name="Stork Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79720" marketgroup="true" meta="0" name="Blackbird Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79721" marketgroup="true" meta="0" name="Rook Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79722" marketgroup="true" meta="0" name="Falcon Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79723" marketgroup="false" meta="0" name="Chimera Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79724" marketgroup="false" meta="0" name="Incursus Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79725" marketgroup="false" meta="0" name="Ishkur Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79726" marketgroup="false" meta="0" name="Algos Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79727" marketgroup="false" meta="0" name="Magus Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79723" marketgroup="true" meta="0" name="Chimera Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79724" marketgroup="true" meta="0" name="Incursus Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79725" marketgroup="true" meta="0" name="Ishkur Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79726" marketgroup="true" meta="0" name="Algos Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79727" marketgroup="true" meta="0" name="Magus Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79728" marketgroup="true" meta="0" name="Celestis Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79729" marketgroup="false" meta="0" name="Lachesis Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79730" marketgroup="false" meta="0" name="Arazu Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79731" marketgroup="false" meta="0" name="Thanatos Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79732" marketgroup="false" meta="0" name="Merlin Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79729" marketgroup="true" meta="0" name="Lachesis Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79730" marketgroup="true" meta="0" name="Arazu Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79731" marketgroup="true" meta="0" name="Thanatos Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79732" marketgroup="true" meta="0" name="Merlin Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79733" marketgroup="true" meta="0" name="Enyo Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79734" marketgroup="false" meta="0" name="Talwar Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79734" marketgroup="true" meta="0" name="Talwar Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79735" marketgroup="true" meta="0" name="Bifrost Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79736" marketgroup="false" meta="0" name="Bellicose Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79737" marketgroup="false" meta="0" name="Huginn Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79738" marketgroup="false" meta="0" name="Rapier Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79739" marketgroup="false" meta="0" name="Nidhoggur Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79740" marketgroup="false" meta="0" name="Vigil Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79741" marketgroup="false" meta="0" name="Kikimora Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79742" marketgroup="false" meta="0" name="Nestor Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79736" marketgroup="true" meta="0" name="Bellicose Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79737" marketgroup="true" meta="0" name="Huginn Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79738" marketgroup="true" meta="0" name="Rapier Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79739" marketgroup="true" meta="0" name="Nidhoggur Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79740" marketgroup="true" meta="0" name="Vigil Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79741" marketgroup="true" meta="0" name="Kikimora Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79742" marketgroup="true" meta="0" name="Nestor Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79743" marketgroup="false" meta="0" name="Stormbringer Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79744" marketgroup="false" meta="0" name="Barghest Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79745" marketgroup="false" meta="0" name="Pontifex Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79744" marketgroup="true" meta="0" name="Barghest Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79745" marketgroup="true" meta="0" name="Pontifex Aurora Universalis SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79755" marketgroup="true" meta="0" name="Rattlesnake Empyrean Outlaws SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79756" marketgroup="true" meta="0" name="Alligator Empyrean Outlaws SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="79757" marketgroup="true" meta="0" name="Gila Empyrean Outlaws SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
Expand Down Expand Up @@ -111602,14 +111602,14 @@
<row category="SKINs" group="Permanent SKIN" id="85885" marketgroup="true" meta="0" name="Sidewinder Victorious Venom SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85886" marketgroup="true" meta="0" name="Cobra Victorious Venom SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85887" marketgroup="true" meta="0" name="Python Victorious Venom SKIN" pi="false" portion="1" price="0" product="0" tech="Tech I" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85890" marketgroup="true" meta="0" name="Maller Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85891" marketgroup="true" meta="0" name="Augoror Navy Issue Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85892" marketgroup="true" meta="0" name="Pontifex Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85893" marketgroup="true" meta="0" name="Punisher Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85894" marketgroup="true" meta="0" name="Eos Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85895" marketgroup="true" meta="0" name="Exequror Navy Issue Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85896" marketgroup="true" meta="0" name="Magus Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85897" marketgroup="true" meta="0" name="Orthrus Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85890" marketgroup="false" meta="0" name="Maller Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85891" marketgroup="false" meta="0" name="Augoror Navy Issue Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85892" marketgroup="false" meta="0" name="Pontifex Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85893" marketgroup="false" meta="0" name="Punisher Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85894" marketgroup="false" meta="0" name="Eos Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85895" marketgroup="false" meta="0" name="Exequror Navy Issue Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85896" marketgroup="false" meta="0" name="Magus Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85897" marketgroup="false" meta="0" name="Orthrus Shattered Paradigm SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85929" marketgroup="true" meta="0" name="Thanatos Arkombine Arisen SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85930" marketgroup="true" meta="0" name="Archon Arkombine Arisen SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
<row category="SKINs" group="Permanent SKIN" id="85931" marketgroup="true" meta="0" name="Chimera Arkombine Arisen SKIN" pi="false" portion="1" price="0" product="0" tech="Premium" volume="0.01"/>
Expand Down

0 comments on commit 34520a1

Please sign in to comment.