Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
TechnicallyCoded committed Jun 8, 2022
2 parents 982a64b + 3917183 commit 179cce2
Show file tree
Hide file tree
Showing 25 changed files with 203 additions and 342 deletions.
32 changes: 0 additions & 32 deletions .classpath

This file was deleted.

5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
out/
target/
dependency-reduced-pom.xml
*.iml
InventoryRollback.iml
InventoryRollbackPlus.iml
.classpath
.project
/spigot_bb_code_description.txt
/spigot_bb_code_description*.txt
23 changes: 0 additions & 23 deletions .project

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

11 changes: 0 additions & 11 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

45 changes: 0 additions & 45 deletions InventoryRollbackPlus.iml

This file was deleted.

116 changes: 0 additions & 116 deletions dependency-reduced-pom.xml

This file was deleted.

13 changes: 11 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.nuclyon.technicallycoded.inventoryrollback</groupId>
<artifactId>InventoryRollbackPlus</artifactId>
<version>1.6.6</version>
<version>1.6.7</version>
<packaging>jar</packaging>
<name>InventoryRollbackPlus</name>
<url>https://github.com/TechnicallyCoded/Inventory-Rollback-Plus/</url>
Expand Down Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.18.1-R0.1-SNAPSHOT</version>
<version>1.19-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- bStats API -->
Expand All @@ -59,7 +59,16 @@
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>22.0.0</version>
<scope>compile</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<scope>compile</scope>
</dependency>

</dependencies>

<build>
Expand Down
Loading

0 comments on commit 179cce2

Please sign in to comment.