From 217be0734a4d9cb8be77c6556d5b67826fa4673e Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 19:47:51 -0600 Subject: [PATCH 1/7] ! brrrrrr --- lib/{CMI-8.6.5.0.jar => CMI.jar} | Bin lib/{Citizens-2.0.25.jar => Citizens.jar} | Bin lib/{Holograms-2.9.1.jar => Holograms.jar} | Bin ...icDisplays-2.4.6.jar => HolographicDisplays.jar} | Bin lib/{Residence-4.8.7.2.jar => Residence.jar} | Bin lib/{SpartanAPI-1.0.jar => SpartanAPI.jar} | Bin pom.xml | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) rename lib/{CMI-8.6.5.0.jar => CMI.jar} (100%) rename lib/{Citizens-2.0.25.jar => Citizens.jar} (100%) rename lib/{Holograms-2.9.1.jar => Holograms.jar} (100%) rename lib/{HolographicDisplays-2.4.6.jar => HolographicDisplays.jar} (100%) rename lib/{Residence-4.8.7.2.jar => Residence.jar} (100%) rename lib/{SpartanAPI-1.0.jar => SpartanAPI.jar} (100%) diff --git a/lib/CMI-8.6.5.0.jar b/lib/CMI.jar similarity index 100% rename from lib/CMI-8.6.5.0.jar rename to lib/CMI.jar diff --git a/lib/Citizens-2.0.25.jar b/lib/Citizens.jar similarity index 100% rename from lib/Citizens-2.0.25.jar rename to lib/Citizens.jar diff --git a/lib/Holograms-2.9.1.jar b/lib/Holograms.jar similarity index 100% rename from lib/Holograms-2.9.1.jar rename to lib/Holograms.jar diff --git a/lib/HolographicDisplays-2.4.6.jar b/lib/HolographicDisplays.jar similarity index 100% rename from lib/HolographicDisplays-2.4.6.jar rename to lib/HolographicDisplays.jar diff --git a/lib/Residence-4.8.7.2.jar b/lib/Residence.jar similarity index 100% rename from lib/Residence-4.8.7.2.jar rename to lib/Residence.jar diff --git a/lib/SpartanAPI-1.0.jar b/lib/SpartanAPI.jar similarity index 100% rename from lib/SpartanAPI-1.0.jar rename to lib/SpartanAPI.jar diff --git a/pom.xml b/pom.xml index 4b50d84f..6037f73b 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ Residence 4.8.7.2 system - ${basedir}/lib/Residence-4.8.7.2.jar + ${basedir}/lib/Residence.jar @@ -184,7 +184,7 @@ CMI 8.6.5.0 system - ${basedir}/lib/CMI-8.6.5.0.jar + ${basedir}/lib/CMI.jar @@ -192,7 +192,7 @@ Holograms 2.9.1 system - ${basedir}/lib/Holograms-2.9.1.jar + ${basedir}/lib/Holograms.jar @@ -200,7 +200,7 @@ HolographicDisplays 2.4.6 system - ${basedir}/lib/HolographicDisplays-2.4.6.jar + ${basedir}/lib/HolographicDisplays.jar @@ -208,7 +208,7 @@ Citizens 2.0.25 system - ${basedir}/lib/Citizens-2.0.25.jar + ${basedir}/lib/Citizens.jar @@ -216,7 +216,7 @@ SpartanAPI 1.0 system - ${basedir}/lib/SpartanAPI-1.0.jar + ${basedir}/lib/SpartanAPI.jar From 76cccb9dff5606e53b050ea3a484402192cd9bc9 Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 19:49:38 -0600 Subject: [PATCH 2/7] ! brrrrrrrrr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6037f73b..e202feb3 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ io.lumine.xikage MythicMobs - 4.11.0-SNAPSHOT + 5.0.0-SNAPSHOT provided From 3a28902cf432378615986aede7e8496378d9e982 Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 19:50:49 -0600 Subject: [PATCH 3/7] ! rbrbrbbrbrrr --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e202feb3..ed8bc785 100644 --- a/pom.xml +++ b/pom.xml @@ -143,8 +143,8 @@ - io.lumine.xikage - MythicMobs + io.lumine + MythicMobs-Dist 5.0.0-SNAPSHOT provided From cd13a042afbb37869cfa120767238ef501b0c7bc Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 20:17:02 -0600 Subject: [PATCH 4/7] ! brrrrrr --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ed8bc785..e76d742f 100644 --- a/pom.xml +++ b/pom.xml @@ -175,8 +175,7 @@ com.bekvon.bukkit.residence Residence 4.8.7.2 - system - ${basedir}/lib/Residence.jar + provided From 2bd01c7b187ae6f499ff1023c247eab144406f5a Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 20:28:00 -0600 Subject: [PATCH 5/7] Moved dependencies to nexus repo --- pom.xml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index e76d742f..ce90b913 100644 --- a/pom.xml +++ b/pom.xml @@ -91,16 +91,28 @@ spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - + sk89q-repo https://maven.enginehub.org/repo/ - + papermc https://papermc.io/repo/repository/maven-public/ + + + + codemc-repo + https://repo.codemc.io/repository/maven-public/ + + + + + citizens-repo + http://repo.citizensnpcs.co/ + @@ -182,40 +194,35 @@ com.Zrips.CMI CMI 8.6.5.0 - system - ${basedir}/lib/CMI.jar + provided com.sainttx.holograms Holograms 2.9.1 - system - ${basedir}/lib/Holograms.jar + provided - com.gmail.filoghost - HolographicDisplays - 2.4.6 - system - ${basedir}/lib/HolographicDisplays.jar + com.gmail.filoghost.holographicdisplays + holographicdisplays-api + 2.4.0 + provided net.citizensnpcs Citizens 2.0.25 - system - ${basedir}/lib/Citizens.jar + provided me.vagdedes.spartan SpartanAPI 1.0 - system - ${basedir}/lib/SpartanAPI.jar + provided From a5ee8bc58121011942762424fd6f60715078f337 Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 20:31:59 -0600 Subject: [PATCH 6/7] Fixing dependency issues --- pom.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index ce90b913..2fc1d4e5 100644 --- a/pom.xml +++ b/pom.xml @@ -107,12 +107,6 @@ codemc-repo https://repo.codemc.io/repository/maven-public/ - - - - citizens-repo - http://repo.citizensnpcs.co/ - @@ -214,7 +208,7 @@ net.citizensnpcs Citizens - 2.0.25 + 2.0.28-SNAPSHOT provided From c6f61234746767bed2190ee38a5064de56472b9d Mon Sep 17 00:00:00 2001 From: Ashijin Date: Tue, 17 Aug 2021 20:42:35 -0600 Subject: [PATCH 7/7] ! brrrr --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fc1d4e5..35e92a4f 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ net.citizensnpcs Citizens - 2.0.28-SNAPSHOT + 2.0.25 provided