Merge branch '1.18' into '1.18'

Overhaul 1.18

See merge request Merith-TK/vanillia-modpack!3

.gitignore

@@ -2,8 +2,12 @@
 .minecraft/.fabric
 .minecraft/config
 .minecraft/coremods
+.minecraft/crash-reports
 .minecraft/essential
 .minecraft/logs
+.minecraft/ModTranslations
+.minecraft/not-enough-crashes
+.minecraft/patched_shaders
 .minecraft/resourcepacks
 .minecraft/saves
 .minecraft/screenshots
@@ -14,10 +18,15 @@
 .minecraft/usercache.json
 .minecraft/whitelist.json
 .minecraft/options.txt
+.minecraft/options.amecsapi.txt
+.minecraft/servers.dat
+.minecraft/servers.dat_old
 
 /instance.cfg
+/.packignore
 
 !.minecraft/config/yosbr/*
+*.disabled
 
 update-pack.data/.*
 update-pack.data/*/

.minecraft/bin/version.json

@@ -1,55 +1,55 @@
 {
-    "id": "1.18",
-    "inheritsFrom": "1.18",
-    "releaseTime": "2021-11-30T20:34:27+00:00",
-    "time": "2021-11-30T20:34:27+00:00",
-    "type": "release",
-    "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
-    "libraries": [
-        {
-            "name": "net.fabricmc:fabric-loader:0.12.6",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "net.fabricmc:yarn:1.18+build.1",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "net.fabricmc:tiny-mappings-parser:0.3.0+build.17",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "net.fabricmc:sponge-mixin:0.10.7+mixin.0.8.4",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "net.fabricmc:tiny-remapper:0.6.0",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "net.fabricmc:access-widener:2.0.1",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "org.ow2.asm:asm:9.2",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "org.ow2.asm:asm-analysis:9.2",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "org.ow2.asm:asm-commons:9.2",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "org.ow2.asm:asm-tree:9.2",
-            "url": "https://maven.fabricmc.net/"
-        },
-        {
-            "name": "org.ow2.asm:asm-util:9.2",
-            "url": "https://maven.fabricmc.net/"
-        }
-    ],
-    "mainClass": "net.fabricmc.loader.impl.launch.knot.KnotClient"
+  "id": "1.18.1",
+  "inheritsFrom": "1.18.1",
+  "releaseTime": "2022-01-15T20:38:05+0000",
+  "time": "2022-01-15T20:38:05+0000",
+  "type": "release",
+  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
+  "libraries": [
+    {
+      "name": "net.fabricmc:tiny-mappings-parser:0.3.0+build.17",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:sponge-mixin:0.10.7+mixin.0.8.4",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:tiny-remapper:0.6.0",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:access-widener:2.0.1",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm-analysis:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm-commons:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm-tree:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "org.ow2.asm:asm-util:9.2",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:intermediary:1.18.1",
+      "url": "https://maven.fabricmc.net/"
+    },
+    {
+      "name": "net.fabricmc:fabric-loader:0.12.12",
+      "url": "https://maven.fabricmc.net/"
+    }
+  ],
+  "mainClass": "net.fabricmc.loader.impl.launch.knot.KnotClient"
 }

README.md

@@ -16,11 +16,14 @@ Does not add any actual content to the game and is compliant with most server's
 * [Fabric API](https://modrinth.com/mod/fabric-api)
 	* Needed Library for most of the mods here
 
-* [Iris Shaders](https://irisshaders.net/)
+* [Iris Shaders Beta](https://irisshaders.net/)
 	* Better Shaders mod for Fabric
 	* Performs better than optifine
 	* Doesnt crash
 	* Compatible with most popular optifine shaders
+	* BETA DOWNLOAD
+		* https://discord.gg/jQJnav2jPu
+		* https://discord.com/channels/774352792659820594/883067831485366304/931403400183160872
 
 * [Lamb Dynamic Lights](https://www.modrinth.com/mod/lambdynamiclights)
 	* Dynamic Lighting, when holding a torch, the area around you lights up
@@ -28,6 +31,8 @@ Does not add any actual content to the game and is compliant with most server's
 * [MinecraftCapes](https://minecraftcapes.net/)
 	* Custom (***free***) Capes for Minecraft
 
-* [Sodium 1.18-0.4.0-alpha5](https://github.com/CaffeineMC/sodium-fabric/releases/tag/mc1.18-0.4.0-alpha5)
+* [Sodium](https://github.com/CaffeineMC/sodium-fabric/releases/tag/mc1.18-0.4.0-alpha5)
 	* no longer bundled in iris, 
-	* gives performance for iris
+	* gives performance for iris
+* [Betterf3](https://modrinth.com/mod/betterf3)
+* 

mmc-pack.json

@@ -17,24 +17,24 @@
                     "uid": "org.lwjgl3"
                 }
             ],
-            "cachedVersion": "1.18",
+            "cachedVersion": "1.18.1",
             "important": true,
             "uid": "net.minecraft",
-            "version": "1.18"
+            "version": "1.18.1"
         },
         {
             "cachedName": "Intermediary Mappings",
             "cachedRequires": [
                 {
-                    "equals": "1.18",
+                    "equals": "1.18.1",
                     "uid": "net.minecraft"
                 }
             ],
-            "cachedVersion": "1.18",
+            "cachedVersion": "1.18.1",
             "cachedVolatile": true,
             "dependencyOnly": true,
             "uid": "net.fabricmc.intermediary",
-            "version": "1.18"
+            "version": "1.18.1"
         },
         {
             "cachedName": "Fabric Loader",
@@ -43,9 +43,9 @@
                     "uid": "net.fabricmc.intermediary"
                 }
             ],
-            "cachedVersion": "0.12.6",
+            "cachedVersion": "0.12.12",
             "uid": "net.fabricmc.fabric-loader",
-            "version": "0.12.6"
+            "version": "0.12.12"
         }
     ],
     "formatVersion": 1