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

Merge branch 'master' into iris4

Browse Source 
# Conflicts:
#	build.gradle
#	core/src/main/java/com/volmit/iris/core/nms/INMS.java
#	core/src/main/java/com/volmit/iris/engine/IrisEngine.java
This commit is contained in:
Julian Krings
2024-08-17 01:03:17 +02:00
parent 8fc70f42fc c3ac41f894
commit 62e98cc371
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -5
View File
@@ -16,10 +16,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import java.util.function.Consumer
buildscript() { buildscript() {
repositories { repositories {
maven { url 'https://jitpack.io'} maven { url 'https://jitpack.io'}
@@ -36,7 +32,7 @@ plugins {
id "de.undercouch.download" version "5.0.1" id "de.undercouch.download" version "5.0.1"
} }
version '4.0-1.19.2-1.21' version '4.0-1.19.2-1.21.1'
// ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
// ======================== WINDOWS ============================= // ======================== WINDOWS =============================
core/src/main/java/com/volmit/iris/core/nms/INMS.java
+2 -1
View File
@@ -29,7 +29,8 @@ public class INMS {
private static final Map<String, String> REVISION = Map.of( private static final Map<String, String> REVISION = Map.of(
"1.20.5", "v1_20_R4", "1.20.5", "v1_20_R4",
"1.20.6", "v1_20_R4", "1.20.6", "v1_20_R4",
"1.21", "v1_21_R1" "1.21", "v1_21_R1",
"1.21.1", "v1_21_R1"
); );
//@done //@done
private static final INMSBinding binding = bind(); private static final INMSBinding binding = bind();
core/src/main/java/com/volmit/iris/core/safeguard/UtilsSFG.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class UtilsSFG {
} }
if (ServerBootSFG.unsuportedversion) { if (ServerBootSFG.unsuportedversion) {
Iris.safeguard(C.RED + "Server Version"); Iris.safeguard(C.RED + "Server Version");
Iris.safeguard(C.RED + "- Iris only supports 1.19.2 > 1.20.6"); Iris.safeguard(C.RED + "- Iris only supports 1.19.2 > 1.21.1");
} }
if (!ServerBootSFG.passedserversoftware) { if (!ServerBootSFG.passedserversoftware) {
Iris.safeguard(C.YELLOW + "Unsupported Server Software"); Iris.safeguard(C.YELLOW + "Unsupported Server Software");