From 0dee8cdca5008ffbe9ae4426ae8945ef621bb433 Mon Sep 17 00:00:00 2001
From: Hiina Kuukan <hiina@hiina.space>
Date: Fri, 9 Aug 2024 14:20:36 -0600
Subject: [PATCH] patch stoat changes

and fix line ending munging from git, confusing.
---
 .gitattributes                     |  2 ++
 .gitignore                         |  5 +++--
 config/dungeon_difficulty_v2.json  | 22 +++++++++++++++++++++-
 config/starterkit/kits/Default.txt |  8 ++++----
 index.toml                         | 25 +++++++++++++++++++++++++
 pack.toml                          |  2 +-
 6 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..00fd358
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# disable line ending munging
+* -crlf
diff --git a/.gitignore b/.gitignore
index c0b8a11..32d6239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-*.zip
-*.mrpack
+*.zip
+*.mrpack
+packwiz.exe
diff --git a/config/dungeon_difficulty_v2.json b/config/dungeon_difficulty_v2.json
index 2c7c791..010b555 100644
--- a/config/dungeon_difficulty_v2.json
+++ b/config/dungeon_difficulty_v2.json
@@ -1,7 +1,7 @@
 {
   "meta": {
     "comment": "IMPORTANT! Make sure to set `allow_customization` to `true` to allow customization of the config",
-    "allow_customization": false,
+    "allow_customization": true,
     "sanitize_config": true,
     "rounding_unit": 0.5
   },
@@ -156,6 +156,17 @@
             "name": "dungeon",
             "level": 4
           }
+        },
+		{
+          "zone_matches": {
+            "biome_regex": ".*",
+            "biome_tag_regex": ".*",
+            "structure_id": "graveyard*|better*|dungeons_arise*|repurposed_structures*|tlc*|imst*"
+          },
+          "difficulty": {
+            "name": "dungeon",
+            "level": 2
+          }
         },
         {
           "zone_matches": {
@@ -287,6 +298,15 @@
           }
         }
       ]
+    }
+	{
+      "world_matches": {
+        "dimension_regex": "minecells:*"
+      },
+      "difficulty": {
+        "name": "normal",
+        "level": 2
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/config/starterkit/kits/Default.txt b/config/starterkit/kits/Default.txt
index 4b0e851..8f42066 100644
--- a/config/starterkit/kits/Default.txt
+++ b/config/starterkit/kits/Default.txt
@@ -5,10 +5,10 @@
 'offhand' : '{Count:1b,id:"minecraft:shield",tag:{Damage:0}}',
 0 : '{Count:1b,id:"minecraft:wooden_sword",tag:{Damage:0}}',
 1 : '{Count:9b,id:"minecraft:bread"}',
-2 : '',
-3 : '',
-4 : '',
-5 : '',
+2 : '{Count:1b,id:"vc_gliders:paraglider_wood",tag:{Damage:0}}',
+3 : '{Count:1b,id:"minecraft:book",tag:{Damage:0}}',
+4 : '{Count:6b,id:"minecraft:torch",tag:{Damage:0}}',
+5 : '{Count:1b,id:"camping:tent_white",tag:{Damage:0}}',
 6 : '',
 7 : '',
 8 : '',
diff --git a/index.toml b/index.toml
index 757bb6d..2ab12f6 100644
--- a/index.toml
+++ b/index.toml
@@ -1702,6 +1702,11 @@ file = "mods/bingus-1.20.1-fabric.pw.toml"
 hash = "669ac6d510e97c2513c5d9d014301c93257d6c4e381de8cd8db7ea3f06cc0a76"
 metafile = true
 
+[[files]]
+file = "mods/bountiful.pw.toml"
+hash = "82a31265d90c885eadccd59c2a35ef795fd526865091243933d52717ef1db4be"
+metafile = true
+
 [[files]]
 file = "mods/cardinal-components-api-5.2.2.pw.toml"
 hash = "ea79e069e08302e49c703a937a99612b8efc89ee978d4cbc03a774a696a8f594"
@@ -2117,6 +2122,11 @@ file = "mods/moremobvariants-fabric+1.20.1-1.3.1.pw.toml"
 hash = "f09e204bf45153e6a68f13c229620bab4fed75bf39d3c9233725e94828b1c5a1"
 metafile = true
 
+[[files]]
+file = "mods/myloot.pw.toml"
+hash = "ef80d969a80ba73f12b696c5cefe753891760b3b1f20bb2d2df24e396f8f6f0d"
+metafile = true
+
 [[files]]
 file = "mods/mythic-mounts-1.20.1-7.2.pw.toml"
 hash = "d79d7511469f8464960c4df792e1b8eb72da55eaea632301a7cf724d1ba80ee1"
@@ -2157,6 +2167,11 @@ file = "mods/no-mob-farms.pw.toml"
 hash = "62f15c41d1ef3227e73f0c4398eb45087f1c5c3840ad9042a5afd532d042719d"
 metafile = true
 
+[[files]]
+file = "mods/nyctophobia.pw.toml"
+hash = "821b6e5d0a115fa14d0692abe41a8c6621f04882aea975829e1d1e51f672ef58"
+metafile = true
+
 [[files]]
 file = "mods/owo-lib-0.11.2+1.20.pw.toml"
 hash = "6bbb74bcd81b68b6fd2a19757b5475ec66ba2a9bf079967c65e27a0e7f239073"
@@ -2297,6 +2312,11 @@ file = "mods/spell_power-0.11.1+1.20.1.pw.toml"
 hash = "3fb877aafedcf7404263ca11a97058daeccc94e738157b10d8a74d7cd23cb612"
 metafile = true
 
+[[files]]
+file = "mods/spoornpacks.pw.toml"
+hash = "ea9bec0e61015a153a13b2f9000651c01df3270328041d2dc3a99153b594d32b"
+metafile = true
+
 [[files]]
 file = "mods/starlight-1.1.2+fabric.dbc156f.pw.toml"
 hash = "3d73d1f9631323a2872eaf957096eb845711844708c74fe6f24f66dcfd8d6378"
@@ -2322,6 +2342,11 @@ file = "mods/toofast-fabric-1.20-1.2.0.pw.toml"
 hash = "b724791d01a4918b3560b98350b2446bc01435cbef8db3a53ba542bbcb30c022"
 metafile = true
 
+[[files]]
+file = "mods/trading-post.pw.toml"
+hash = "ab79382da2352224ee41d8ccdb8b207ecd5b3cb1b6e63815297263fb32b54945"
+metafile = true
+
 [[files]]
 file = "mods/trinkets-3.7.2.pw.toml"
 hash = "e023bcdf1775fa33d5519c1b8f1dac83a2ea7115789036801622fe4a894cdadb"
diff --git a/pack.toml b/pack.toml
index 95a9dfd..ebde2f9 100644
--- a/pack.toml
+++ b/pack.toml
@@ -4,7 +4,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "d45dd96f37ba739a5dddf1d23775fb7b3bdbff366d61dc251217b78d625b18db"
+hash = "4309ea70e7fd1ec31bf9285f714a4f26899a8d78d9429bad4e8e1d145bf0c5c5"
 
 [versions]
 fabric = "0.16.0"