diff --git a/src/config/paxi/datapacks/BetterCombatCompat.zip b/src/config/paxi/datapacks/BetterCombatCompat.zip
index b802dcb..8482c05 100644
Binary files a/src/config/paxi/datapacks/BetterCombatCompat.zip and b/src/config/paxi/datapacks/BetterCombatCompat.zip differ
diff --git a/src/index.toml b/src/index.toml
index 79bcbaa..076fd55 100644
--- a/src/index.toml
+++ b/src/index.toml
@@ -10,7 +10,7 @@ hash = "1b26d2227e4b6e7c26e5ddd3276ab4911c4c96586801c740e970acade25c9cb4"
 
 [[files]]
 file = "config/paxi/datapacks/BetterCombatCompat.zip"
-hash = "84ecc4ace0bc1ddf1587e872bf1c519d4d3586b1c35d25369e30eb5b2dfe8361"
+hash = "813d3747cab70274f3dcabfedb67bba271534b8839e3dd59c3fbb56d059182a0"
 
 [[files]]
 file = "config/paxi/datapacks/ctov-immersive-engineering-compat.pw.toml"
@@ -49,7 +49,7 @@ hash = "23116999939851feb0b358564af45813b1e65fbd1e33d9ccfe6fac7b7027e1ad"
 
 [[files]]
 file = "kubejs/client_scripts/cape.js"
-hash = "9f0f0e0f0743ec52639ee543983c565bf79724988a1b08b5c21f70201fa5d20d"
+hash = "d86fdabd2650706a673bc235e3fa19b4339f7d6e3dec2c0dd938f40c7ef880dd"
 
 [[files]]
 file = "kubejs/config/client.properties"
@@ -79,6 +79,10 @@ hash = "095acfebbd9df9dcbaceb2bcd5bf9980956fb9d0dedea3fb6671e95039f6e0ed"
 file = "kubejs/server_scripts/test.js"
 hash = "698d489a6bec11eafe725433e11c9d1733313c6c617834ca216c92a3c6c5acfd"
 
+[[files]]
+file = "kubejs/server_scripts/weapon_compat.js"
+hash = "4e8a8f93ed0f9df3af8d539ed1477732bf01796fe8ec8e13122b37830343b005"
+
 [[files]]
 file = "mods/achievements-optimizer.pw.toml"
 hash = "75889cd64eaaa53e048df6796dba423aed5aa7fdbf2c82c262ad59eaf5a29c85"
diff --git a/src/kubejs/client_scripts/cape.js b/src/kubejs/client_scripts/cape.js
index 936d679..81e6b76 100644
--- a/src/kubejs/client_scripts/cape.js
+++ b/src/kubejs/client_scripts/cape.js
@@ -1,6 +1,6 @@
 CapeJS.addCapes(event => {
     event.register("475112a5-d201-455e-937f-89faefc9e917", "galacticfactory"); // SeaswimmerTheFsh
-    event.register("7d306e79-b777-4b77-85b8-1e4d41b514e5", "galacticfactory"); // ShamuTheTadpole6
+    event.register("3fbe9244-8e70-4e15-9bfb-a95dba4b04c8", "galacticfactory"); // ShamuTeTadpole
     event.register("9cc40871-e8f4-48aa-9eee-437c65e85fd9", "galacticfactory"); // ManleyChance
     event.register("6cd5fa6a-3862-4ee1-918c-c6476fe0b395", "galacticfactory"); // ProfDrCake
     event.register("a77e843d-e866-4b96-84a2-c83f3f0ad82c", "galacticfactory"); // Th3_l3g0_buIlder
diff --git a/src/kubejs/server_scripts/weapon_compat.js b/src/kubejs/server_scripts/weapon_compat.js
new file mode 100644
index 0000000..398703f
--- /dev/null
+++ b/src/kubejs/server_scripts/weapon_compat.js
@@ -0,0 +1,7 @@
+ServerEvents.tags('item', event => {
+    event.add('immersiveengineering:toolbox/tools','mekaweapons:mekatana');
+    event.add('minecraft:tools','mekaweapons:mekatana');
+    event.add('forge:tools','mekaweapons:mekatana');
+    event.add('minecraft:swords','mekaweapons:mekatana');
+    event.add('minecraft:breas_decorated_pots','mekaweapons:mekatana');
+})
diff --git a/src/pack.toml b/src/pack.toml
index dfaded3..3da9587 100644
--- a/src/pack.toml
+++ b/src/pack.toml
@@ -1,12 +1,12 @@
 name = "GalacticFactory"
 author = "GalacticFactory"
-version = "0.5.7"
+version = "0.5.8"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "cf9d0fc09e164bc2a1b1d7790dd9241e5cff9746d4e4835c18e272067889bd43"
+hash = "8a633d6ce57966fa709d77bbe5dab61cd5d37028e58e39a82bce1af85d19b27e"
 
 [versions]
 forge = "47.2.0"