From e3955328039359363b7ffd7d36f576420cd1ac65 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Wed, 15 Nov 2023 21:13:38 -0500
Subject: [PATCH] Version bump to 0.5.8

Updated datapacks:
- BetterCombatCompat

KubeJS Scripts modified:
- cape.js
- weapon_compat.js
---
 .../paxi/datapacks/BetterCombatCompat.zip     | Bin 14507 -> 16910 bytes
 src/index.toml                                |   8 ++++++--
 src/kubejs/client_scripts/cape.js             |   2 +-
 src/kubejs/server_scripts/weapon_compat.js    |   7 +++++++
 src/pack.toml                                 |   4 ++--
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 src/kubejs/server_scripts/weapon_compat.js

diff --git a/src/config/paxi/datapacks/BetterCombatCompat.zip b/src/config/paxi/datapacks/BetterCombatCompat.zip
index b802dcb199dcfc19d2d956f2ef4171c6f263825d..8482c05f7d4e64bcdea27852e6a0a12d03cb264b 100644
GIT binary patch
delta 2325
zcmbVNO=uHA6rN3gtZ6N+R%>XBOK56sH32C}NeihxX;Y+1Lbae_l1!Vm+1;4k5`#*x
z6_H}KbwQ|lD557p51xe9Qx78IMK3}xf>+U-7ZKm&XS=g&qUpkfOtSC$zBli^Z=PSi
zdy{LL2-eiv5q<d9m8Q=6^=z1|XII=EHrNMy+5H3m_I?lFnwngYz8~*_*q)W&!?{9e
zn9N;iL|iR}%zs?9^Sm>K(?n98e%=`+s!Gx^S&U-UKZ{i?VW<7N-KZlqNrOv|19hS}
zyyp?5_?)7q1)Q9g(_}^#q!~{*v>VmvnsZds`Hi!VZV0C9Xr)*|nieEM%|_yBA(?bv
zQe?>hS5+RdB+ft<xe96YSCWz;I3-IFtU`LxIh82J#4JkaS+zlS4N$Yx<ktMsTUvv|
z2#urR>R9w6P;kb40NM!W&TTG+Tx;`FZp3nu<i^qw;Ov7H*db*Ciy}#zS=nT@(;T0>
zv$?hP$>~~qXpwPy{D-3#B=o}?*`W+L@i??*c^%pq*FAdw$@{kD!HF}++Vdw-ni#fI
zn@bWzGK(ca5sg)ZkqXdqfmHqBEddo90U+`nel0%rEI)MsH25D7Sd~Q~7KsZARum#e
zlm9w)z%4Vi{`}Y~v8<XPrLo;^#l)}W&(Ma5*2HZVroHjC?~kamY#BA$X$QVO-b}mJ
z7ELwQZgI|{=V&judtgdhz;>wk%d5DpYk>Z=;O(=mXSJ8!F1q{R^%{0A-^t>Rbu4Yw
zH&*;()La(_ItUrirv-gGk>OA!1FEA2M7hIO_bI?YJbHTLT_qTO5RG1>BZtfa`x${D
zTLpoC>!<>-?CT;F*kB;wA4bWqs{_`P*me`0DM6W7+b}YPYpO~?XJSl5Cle?cYYs-T
zpF1RDtwOJk&s?2mraG%|3+C@HgDdE<r_8ZD6Z^#yTfUsoftaGP?qJM&sLrg!idNn$
z^wafF7IxH)EFaA*bnsh^gRdhEP^4gk=b{P|vIMJ<X}@SaLMa@Zb&D~Ps5l(b1JBVw
wey@8U8bC-3(5tW@0We_HI(8KUQ_@T^ioI9ht%+bAz|#qDL66|ug(1581Cl?IdH?_b

delta 353
zcmeBcVO(9v6X4Cv!o>gri+CpT$gnvSg{C?bO`d2cJlU3&g9#|;t${^wniZ0uC^L%)
z&;Smg5e4DPYCoLO1oE^d{<DFpNnp{FcynaZkv%S|3uZ;>F@P+E>6o0yrUX+rjjbPO
z<79Pqd8o){A9h(2kWjX@78BT6;*-}|vw=jmS(~AW@Y;AlL}YnU95T7l#tSN80+R6N
z(2pwty090BxfvvYBm)B@5HD%00#XHu$=Q0j$+@W|iJ>8^49s9#WkELXaFh`?W`e3H
Y$V*2^3yZL_flOfoLIt3TQZo<_03vN(YybcN

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"