mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-18 14:50:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-macos-build-error

Browse Source
This commit is contained in:
Brian Fopiano
2023-07-29 03:03:00 -07:00
committed by GitHub
parent b5fdeb2a02 4d8e36cb05
commit 2e707adaa0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE/bug.yml
+3
View File
@@ -40,6 +40,9 @@ body:
- 1.17.1 - 1.17.1
- 1.18 - 1.18
- 1.19 - 1.19
- 1.20
- 1.21
- 1.22
validations: validations:
required: true required: true
- type: input - type: input
build.gradle
+3 -2
View File
@@ -24,7 +24,7 @@ plugins {
id "de.undercouch.download" version "5.0.1" id "de.undercouch.download" version "5.0.1"
} }
version '2.7.2-1.20.1' version '2.7.3-1.20.1'
def nmsVersion = '1.20.1' //[NMS] def nmsVersion = '1.20.1' //[NMS]
def apiVersion = '1.20' def apiVersion = '1.20'
def specialSourceVersion = '1.11.0' //[NMS] def specialSourceVersion = '1.11.0' //[NMS]
@@ -83,6 +83,7 @@ repositories {
maven { url "https://mvn.lumine.io/repository/maven/" } maven { url "https://mvn.lumine.io/repository/maven/" }
maven { url "https://repo.triumphteam.dev/snapshots" } maven { url "https://repo.triumphteam.dev/snapshots" }
maven { url "https://repo.mineinabyss.com/releases" } maven { url "https://repo.mineinabyss.com/releases" }
maven { url = 'https://hub.jeff-media.com/nexus/repository/jeff-media-public/' }
} }
/** /**
@@ -134,7 +135,7 @@ dependencies {
// Third Party Integrations // Third Party Integrations
implementation 'com.ticxo.playeranimator:PlayerAnimator:R1.2.7' implementation 'com.ticxo.playeranimator:PlayerAnimator:R1.2.7'
implementation 'com.github.oraxen:oraxen:1.152.5' implementation 'com.github.oraxen:oraxen:1.158.0'
implementation 'com.github.LoneDev6:api-itemsadder:3.4.1-r4' implementation 'com.github.LoneDev6:api-itemsadder:3.4.1-r4'
implementation 'me.clip:placeholderapi:2.11.3' implementation 'me.clip:placeholderapi:2.11.3'
//implementation files('libs/CustomItems.jar') //implementation files('libs/CustomItems.jar')
src/main/java/com/volmit/iris/Iris.java
+1 -1
View File
@@ -91,7 +91,7 @@ import java.util.Map;
@SuppressWarnings("CanBeFinal") @SuppressWarnings("CanBeFinal")
public class Iris extends VolmitPlugin implements Listener { public class Iris extends VolmitPlugin implements Listener {
public static final String OVERWORLD_TAG = "3004"; public static final String OVERWORLD_TAG = "3005";
private static final Queue<Runnable> syncJobs = new ShurikenQueue<>(); private static final Queue<Runnable> syncJobs = new ShurikenQueue<>();