Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop-local
Browse files Browse the repository at this point in the history
  • Loading branch information
Exslims committed Mar 9, 2017
2 parents 4657966 + 949084d commit 3965691
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

Download and Install Java: [https://java.com/download](https://java.com/download)

Download MercuryTrade.jar:
Download MercuryTrade.jar: [Latest release](https://github.com/Exslims/MercuryTrade/releases)

Feedback and suggestions:
Feedback and suggestions: [Link](https://github.com/Exslims/MercuryTrade/issues)

---
<p align="center">
<img src="http://i.imgur.com/DWJQSsL.png"/>
</p>
<p align="center">
<img src="http://i.imgur.com/DWJQSsL.png"/>
</p>

**MercuryTrade** is an overlay application for Path of Exile written in Java. It's designed to facilitate all possible trading interactions providing a much better user experience for the players. The program went through countless design iterations and made by active Path of Exile players who use this tool themselves on a regular basis.

Expand Down
2 changes: 0 additions & 2 deletions app-socket-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,5 @@
<artifactId>mockito-all</artifactId>
<version>${mockito.version}</version>
</dependency>

</dependencies>

</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<packaging>pom</packaging>

<properties>
<project.version>1.0.0</project.version>
<project.version>1.0.0.0</project.version>

<systemhook.version>2.5</systemhook.version>
<jna.version>3.0.9</jna.version>
Expand Down

0 comments on commit 3965691

Please sign in to comment.