Fix conflict

2025-12-31 20:56:08 +00:00 · 2021-07-25 18:34:28 -05:00
parent 9069e9c9d0
commit 65d3068e9f
1150 changed files with 6065 additions and 1550 deletions
--- a/launcher/testdata/test_folder/assets/minecraft/textures/blah.txt
+++ b/launcher/testdata/test_folder/assets/minecraft/textures/blah.txt
@@ -0,0 +1 @@
+ 
--- a/launcher/testdata/test_folder/pack.mcmeta
+++ b/launcher/testdata/test_folder/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 1,
+    "description": "Some resource pack maybe"
+  }
+}
--- a/launcher/testdata/test_folder/pack.nfo
+++ b/launcher/testdata/test_folder/pack.nfo
@@ -0,0 +1 @@
+