From 9eeede08ee07151acb571091e2a6f017d1c0f2bb Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Wed, 15 Nov 2023 20:07:46 -0500
Subject: [PATCH] Version bump to 0.5.6

Mods added:
- Ender Trigon
- L_ender's Cataclysm

Configs changed:
- bettercombat/fallback_compatibility
  - Added support for the Meka-tana
---
 .../bettercombat/fallback_compatibility.json  | 116 ++++++++++++++++++
 src/index.toml                                |  14 +++
 src/mods/ender-trigon.pw.toml                 |  13 ++
 src/mods/l_ender-s-cataclysm.pw.toml          |  13 ++
 src/pack.toml                                 |   4 +-
 5 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 src/config/bettercombat/fallback_compatibility.json
 create mode 100644 src/mods/ender-trigon.pw.toml
 create mode 100644 src/mods/l_ender-s-cataclysm.pw.toml

diff --git a/src/config/bettercombat/fallback_compatibility.json b/src/config/bettercombat/fallback_compatibility.json
new file mode 100644
index 0000000..8db40b9
--- /dev/null
+++ b/src/config/bettercombat/fallback_compatibility.json
@@ -0,0 +1,116 @@
+{
+  "schema_version": 1,
+  "blacklist_item_id_regex": "pickaxe",
+  "fallback_compatibility": [
+    {
+      "item_id_regex": "claymore|great_sword|greatsword",
+      "weapon_attributes": "bettercombat:claymore"
+    },
+    {
+      "item_id_regex": "great_hammer|greathammer|war_hammer|warhammer|maul",
+      "weapon_attributes": "bettercombat:hammer"
+    },
+    {
+      "item_id_regex": "double_axe|doubleaxe|war_axe|waraxe|great_axe|greataxe",
+      "weapon_attributes": "bettercombat:double_axe"
+    },
+    {
+      "item_id_regex": "scythe",
+      "weapon_attributes": "bettercombat:scythe"
+    },
+    {
+      "item_id_regex": "halberd",
+      "weapon_attributes": "bettercombat:halberd"
+    },
+    {
+      "item_id_regex": "glaive",
+      "weapon_attributes": "bettercombat:glaive"
+    },
+    {
+      "item_id_regex": "spear",
+      "weapon_attributes": "bettercombat:spear"
+    },
+    {
+      "item_id_regex": "lance",
+      "weapon_attributes": "bettercombat:lance"
+    },
+    {
+      "item_id_regex": "anchor",
+      "weapon_attributes": "bettercombat:anchor"
+    },
+    {
+      "item_id_regex": "battlestaff|battle_staff",
+      "weapon_attributes": "bettercombat:battlestaff"
+    },
+    {
+      "item_id_regex": "claw",
+      "weapon_attributes": "bettercombat:claw"
+    },
+    {
+      "item_id_regex": "fist|gauntlet",
+      "weapon_attributes": "bettercombat:fist"
+    },
+    {
+      "item_id_regex": "trident|impaled",
+      "weapon_attributes": "bettercombat:trident"
+    },
+    {
+      "item_id_regex": "katana|mekatana",
+      "weapon_attributes": "bettercombat:katana"
+    },
+    {
+      "item_id_regex": "rapier",
+      "weapon_attributes": "bettercombat:rapier"
+    },
+    {
+      "item_id_regex": "sickle",
+      "weapon_attributes": "bettercombat:sickle"
+    },
+    {
+      "item_id_regex": "soul_knife",
+      "weapon_attributes": "bettercombat:soul_knife"
+    },
+    {
+      "item_id_regex": "dagger|knife",
+      "weapon_attributes": "bettercombat:dagger"
+    },
+    {
+      "item_id_regex": "staff|wand|sceptre|stave|rod",
+      "weapon_attributes": "bettercombat:wand"
+    },
+    {
+      "item_id_regex": "mace|hammer|flail",
+      "weapon_attributes": "bettercombat:mace"
+    },
+    {
+      "item_id_regex": "axe",
+      "weapon_attributes": "bettercombat:axe"
+    },
+    {
+      "item_id_regex": "coral_blade",
+      "weapon_attributes": "bettercombat:coral_blade"
+    },
+    {
+      "item_id_regex": "twin_blade|twinblade",
+      "weapon_attributes": "bettercombat:twin_blade"
+    },
+    {
+      "item_id_regex": "cutlass|scimitar|machete",
+      "weapon_attributes": "bettercombat:cutlass"
+    },
+    {
+      "item_id_regex": "sword|blade",
+      "weapon_attributes": "bettercombat:sword"
+    }
+  ],
+  "ranged_weapons": [
+    {
+      "item_id_regex": "two_handed_crossbow",
+      "weapon_attributes": "bettercombat:crossbow_two_handed_heavy"
+    },
+    {
+      "item_id_regex": "two_handed_bow",
+      "weapon_attributes": "bettercombat:bow_two_handed_heavy"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/index.toml b/src/index.toml
index b908cb8..bfcb067 100644
--- a/src/index.toml
+++ b/src/index.toml
@@ -4,6 +4,10 @@ hash-format = "sha256"
 file = "config/Mekanism/additions.toml"
 hash = "d3f67c209e5b3c9d7f840b3e4bbdb48149220d209d9b9bc5317dca83694d60cd"
 
+[[files]]
+file = "config/bettercombat/fallback_compatibility.json"
+hash = "35d94cbd31de80d989b526ca78e497538c1e8a4a959589d5d98b83ab913a45ba"
+
 [[files]]
 file = "config/builtinservers.json"
 hash = "1b26d2227e4b6e7c26e5ddd3276ab4911c4c96586801c740e970acade25c9cb4"
@@ -290,6 +294,11 @@ file = "mods/enchantment-descriptions.pw.toml"
 hash = "047c2676a37cbc1e8ba2eef7e590b233a59ba97a04cbd9faf85e6b3412d4a51b"
 metafile = true
 
+[[files]]
+file = "mods/ender-trigon.pw.toml"
+hash = "375b586742ab1869f81c45940879d7829a399da0cd29058d068f033c20d54523"
+metafile = true
+
 [[files]]
 file = "mods/fallingleavesforge.pw.toml"
 hash = "18311cdec474d21247f33fede33ffef2ca27b715dec47b4914957a8ec59cbe6e"
@@ -465,6 +474,11 @@ file = "mods/kubejs.pw.toml"
 hash = "ac7e428dcfa3ff3c861088ec50585fcd6d8ae7f2e9ce4321781c4fd864691a34"
 metafile = true
 
+[[files]]
+file = "mods/l_ender-s-cataclysm.pw.toml"
+hash = "5501b7c8c9ed36f25e60c92a43143ee0d8894a0f35f0ea59302ac7188a15aecb"
+metafile = true
+
 [[files]]
 file = "mods/laserio.pw.toml"
 hash = "4205c8912564c477a8762eb1ffcabef42bcea54d9b50a9dcc7d2196d0e63ae29"
diff --git a/src/mods/ender-trigon.pw.toml b/src/mods/ender-trigon.pw.toml
new file mode 100644
index 0000000..a876a62
--- /dev/null
+++ b/src/mods/ender-trigon.pw.toml
@@ -0,0 +1,13 @@
+name = "Ender Trigon"
+filename = "endertrigon-1.20.1-1.0.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "49b37c82cfdf418c53c400927d02b121c20db773"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4621953
+project-id = 662563
diff --git a/src/mods/l_ender-s-cataclysm.pw.toml b/src/mods/l_ender-s-cataclysm.pw.toml
new file mode 100644
index 0000000..55c420d
--- /dev/null
+++ b/src/mods/l_ender-s-cataclysm.pw.toml
@@ -0,0 +1,13 @@
+name = "L_Ender 's Cataclysm"
+filename = "L_Enders_Cataclysm-1.39 -1.20.1.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "f080a37b663efccbababb9298a3b21c8e04af730"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 4778613
+project-id = 551586
diff --git a/src/pack.toml b/src/pack.toml
index 46167cf..1aa7f3d 100644
--- a/src/pack.toml
+++ b/src/pack.toml
@@ -1,12 +1,12 @@
 name = "GalacticFactory"
 author = "GalacticFactory"
-version = "0.5.5"
+version = "0.5.6"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "ce85f1d770dfd6b22adb62cb3186ffb6a472e5da9985a6ce4ac8335a6e0294ff"
+hash = "646abdf140374c054aae1b9ed5d53a107e0036568cbe7c240e56d66e53d3b07d"
 
 [versions]
 forge = "47.2.0"