merge upstream

2026-05-05 10:00:18 +02:00
parent 9fea29cbb6 1f1024251b
commit 9bd6fb0105
141 changed files with 6544 additions and 5420 deletions
@@ -54,6 +54,7 @@ forge_version=36.2.39
 	
    # Forge mod versions
    terraforged_version=4044290
+    oculus_version=

    # Forge mod run
    # 0 = Don't enable and don't run
@@ -62,3 +63,4 @@ forge_version=36.2.39
    enable_starlight_forge=0
    enable_terraforged=1
    enable_terrafirmacraft=0
+    enable_oculus=0
@@ -53,6 +53,7 @@ forge_version=37.1.1
 	
    # Forge mod versions
    terraforged_version=
+    oculus_version=

    # Forge mod run
    # 0 = Don't enable and don't run
@@ -61,3 +62,4 @@ forge_version=37.1.1
    enable_starlight_forge=0
    enable_terraforged=0
    enable_terrafirmacraft=0
+    enable_oculus=0
@@ -62,6 +62,7 @@ forge_version=40.2.10
 	
    # Forge mod versions
    terraforged_version=
+    oculus_version=

    # Forge mod run
    # 0 = Don't enable and don't run
@@ -69,4 +70,5 @@ forge_version=40.2.10
    # 2 = Can be referenced in code and runs in client
    enable_starlight_forge=0
    enable_terraforged=0
-    enable_terrafirmacraft=0
+    enable_terrafirmacraft=0
+    enable_oculus=0
@@ -52,6 +52,7 @@ forge_version=43.3.2
 	
    # Forge mod versions
    terraforged_version=
+    oculus_version=

    # Forge mod run
    # 0 = Don't enable and don't run
@@ -60,3 +61,4 @@ forge_version=43.3.2
    enable_starlight_forge=0
    enable_terraforged=0
    enable_terrafirmacraft=0
+    enable_oculus=0
@@ -51,6 +51,7 @@ forge_version=45.2.4
 	
    # Forge mod versions
    terraforged_version=
+    oculus_version=

    # Forge mod run
    # 0 = Don't enable and don't run
@@ -59,3 +60,4 @@ forge_version=45.2.4
    enable_starlight_forge=0
    enable_terraforged=0
    enable_terrafirmacraft=0
+    enable_oculus=0
@@ -51,6 +51,7 @@ forge_version=47.2.1
 	
    # Forge mod versions
    terraforged_version=
+    oculus_version=1.20.1-1.8.0

    # Forge mod run
    # 0 = Don't enable and don't run
@@ -59,3 +60,4 @@ forge_version=47.2.1
    enable_starlight_forge=0
    enable_terraforged=0
    enable_terrafirmacraft=0
+    enable_oculus=1
@@ -51,6 +51,7 @@ forge_version=48.0.13

    # Forge mod versions
    terraforged_version=
+    oculus_version=

    # Forge mod run
    # 0 = Don't enable and don't run
@@ -59,3 +60,4 @@ forge_version=48.0.13
    enable_starlight_forge=0
    enable_terraforged=0
    enable_terrafirmacraft=0
+    enable_oculus=0
@@ -52,6 +52,7 @@ neoforge_version=

    # Forge mod versions
    terraforged_version=
+    oculus_version=

    # Forge mod run
    # 0 = Don't enable and don't run
@@ -60,3 +61,4 @@ neoforge_version=
    enable_starlight_forge=0
    enable_terraforged=0
    enable_terrafirmacraft=0
+    enable_oculus=0
@@ -47,7 +47,7 @@ fabric_api_version=0.97.8+1.20.6

 # NeoForge loader
 forge_version=
-neoforge_version=20.6.136
+neoforge_version=136
    neoforge_version_range=[*,)
    
    # NeoForge mod versions
@@ -15,7 +15,7 @@ lwjgl_version=3.3.3

 # Fabric loader
 fabric_loader_version=0.16.9
-fabric_api_version=0.115.0+1.21.1
+fabric_api_version=0.116.11+1.21.1
    # Fabric mod versions
    modmenu_version=11.0.0-beta.1
    starlight_version_fabric=
@@ -47,7 +47,7 @@ fabric_api_version=0.115.0+1.21.1

 # NeoForge loader
 forge_version=
-neoforge_version=21.1.216
+neoforge_version=216
    neoforge_version_range=[*,)
    
    # NeoForge mod versions
@@ -15,7 +15,7 @@ lwjgl_version=3.2.3

 # Fabric loader
 fabric_loader_version=0.17.3
-fabric_api_version=0.138.3+1.21.10
+fabric_api_version=0.138.4+1.21.10
    modmenu_version=16.0.0-rc.1
    starlight_version_fabric=
    phosphor_version_fabric=
@@ -45,7 +45,7 @@ fabric_api_version=0.138.3+1.21.10

 # NeoForge loader
 forge_version=
-neoforge_version=21.10.56-beta
+neoforge_version=64
    neoforge_version_range=[21.10.6-beta,)
    
    # NeoForge mod versions
@@ -45,11 +45,11 @@ fabric_api_version=0.139.4+1.21.11

 # NeoForge loader
 forge_version=
-neoforge_version=21.11.38-beta
+neoforge_version=38-beta
    neoforge_version_range=[*,)
    
    # NeoForge mod versions
-    neo_iris_version=1.10.2+1.21.11-neoforge
+    neo_iris_version=1.10.7+1.21.11-neoforge
    
    # (Neo)Forge mod run
    # 0 = Don't enable and don't run
@@ -4,7 +4,7 @@ minecraft_version=1.21.3
 parchment_version=1.21:2024.07.28
 compatible_minecraft_versions=["1.21.3"]
 accessWidenerVersion=1_21_3
-builds_for=neoforge,fabric
+builds_for=fabric,neoforge
 # forge is broken due to gradle/build script issues

 # Netty
@@ -47,7 +47,7 @@ fabric_api_version=0.110.0+1.21.3

 # NeoForge loader
 forge_version=
-neoforge_version=21.3.86
+neoforge_version=86
    neoforge_version_range=[*,)

    # NeoForge mod versions
@@ -4,7 +4,7 @@ minecraft_version=1.21.4
 parchment_version=1.21:2024.07.28
 compatible_minecraft_versions=["1.21.4"]
 accessWidenerVersion=1_21_4
-builds_for=neoforge,fabric
+builds_for=fabric,neoforge
 # forge is broken due to gradle/build script issues

 # Netty
@@ -46,7 +46,7 @@ fabric_api_version=0.110.5+1.21.4

 # NeoForge loader
 forge_version=
-neoforge_version=21.4.147
+neoforge_version=147
    # version range may not be necessary, but having compiled DH for an older version caused issues with shaders
    neoforge_version_range=[21.4.147,)

@@ -46,7 +46,7 @@ fabric_api_version=0.119.5+1.21.5

 # NeoForge loader
 forge_version=
-neoforge_version=21.5.87
+neoforge_version=87
    neoforge_version_range=[*,)

    # NeoForge mod versions
@@ -45,7 +45,7 @@ fabric_api_version=0.127.0+1.21.6

 # NeoForge loader
 forge_version=
-neoforge_version=21.6.20-beta
+neoforge_version=20-beta
    # around 6.19 neo changed how their render API works, failing to meet this causes the game to crash
    neoforge_version_range=[21.6.19-beta,)

@@ -45,7 +45,7 @@ fabric_api_version=0.133.4+1.21.8

 # NeoForge loader
 forge_version=
-neoforge_version=21.8.52
+neoforge_version=52
    # around 6.19 neo changed how their render API works, failing to meet this causes the game to crash
    neoforge_version_range=[*,)

@@ -45,7 +45,7 @@ fabric_api_version=0.134.0+1.21.9

 # NeoForge loader
 forge_version=
-neoforge_version=21.9.15-beta
+neoforge_version=15-beta
    # sometime before 21.9.15-beta Neoforge changed how their rendering API events handle levels
    # so we can't support both versions at once
    neoforge_version_range=[21.9.15-beta,)
@@ -0,0 +1,59 @@
+# 26.1.2 version
+java_version=25
+minecraft_version=26.1.2
+parchment_version=1.21:2024.07.28
+# version range should be used instead of individual versions due to how NeoForge handles version loading
+compatible_minecraft_versions=["26.1.0", "26.1.2"]
+accessWidenerVersion=26_1
+builds_for=fabric,neoforge
+# forge is broken due to gradle/build script issues
+
+# Netty
+netty_version=4.1.97.Final
+
+# LWJGL
+lwjgl_version=3.4.1
+
+# Fabric loader
+fabric_loader_version=0.18.5
+fabric_api_version=0.145.4+26.1.2
+modmenu_version=18.0.0-alpha.8
+starlight_version_fabric=
+phosphor_version_fabric=
+lithium_version=
+sodium_version=mc26.1.1-0.8.9-fabric
+iris_version=1.10.9+26.1-fabric
+bclib_version=
+immersive_portals_version=
+canvas_version=
+
+fabric_incompatibility_list={ }
+fabric_recommend_list={}
+
+# Fabric mod run
+# 0 = Don't enable and don't run
+# 1 = Can be referenced in code but doesn't run
+# 2 = Can be referenced in code and runs in client
+enable_mod_menu=2
+enable_starlight=0
+enable_phosphor=0
+enable_sodium=1
+enable_lithium=0
+enable_iris=1
+enable_bclib=0
+enable_immersive_portals=0
+enable_canvas=0
+
+# NeoForge loader
+forge_version=
+neoforge_version=15-beta
+neoforge_version_range=[*,)
+
+# NeoForge mod versions
+neo_iris_version=1.10.9+26.1-neoforge
+
+# (Neo)Forge mod run
+# 0 = Don't enable and don't run
+# 1 = Can be referenced in code but doesn't run
+# 2 = Can be referenced in code and runs in client
+neo_enable_iris=1