diff --git a/versions/fabric/1.20.1/index.toml b/versions/fabric/1.20.1/index.toml
index 7b4a376..a17167c 100644
--- a/versions/fabric/1.20.1/index.toml
+++ b/versions/fabric/1.20.1/index.toml
@@ -146,11 +146,6 @@ file = "mods/ears.pw.toml"
 hash = "71644e8041262193332f28d24b649c06c81074a983c6e3acd18b62a117b68b60"
 metafile = true
 
-[[files]]
-file = "mods/ebe.pw.toml"
-hash = "b8270928d44781b9e59982d376bb3cc0d24089ceebef3c79d3e1e881ba7ece60"
-metafile = true
-
 [[files]]
 file = "mods/entity-model-features.pw.toml"
 hash = "65c4754081efdfa32071560e11c8016acdf712b6b82e4b263b3cf414477d0fdc"
@@ -286,6 +281,11 @@ file = "mods/nuit.pw.toml"
 hash = "421b6b05164e623dc65e0e4133fc484fb3b87b26b040ad4b2ffb239491d8bb2d"
 metafile = true
 
+[[files]]
+file = "mods/obe.pw.toml"
+hash = "0704b8ac961026eca017486553b2f00acaf4fcc5efedb95137d8fa5d240f1382"
+metafile = true
+
 [[files]]
 file = "mods/optigui.pw.toml"
 hash = "9ed765da71f977af16c71b3ff56356dea5a149d9626277e4d4868941f8efa1b0"
diff --git a/versions/fabric/1.20.1/mods/ebe.pw.toml b/versions/fabric/1.20.1/mods/ebe.pw.toml
deleted file mode 100644
index 5b5330d..0000000
--- a/versions/fabric/1.20.1/mods/ebe.pw.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Enhanced Block Entities"
-filename = "enhancedblockentities-0.9+1.20.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/OVuFYfre/versions/i3v1Skck/enhancedblockentities-0.9%2B1.20.jar"
-hash-format = "sha1"
-hash = "61cfe50f69f8ef9e3640c0269ef158870f5b0410"
-
-[update]
-[update.modrinth]
-mod-id = "OVuFYfre"
-version = "i3v1Skck"
diff --git a/versions/fabric/1.20.1/mods/obe.pw.toml b/versions/fabric/1.20.1/mods/obe.pw.toml
new file mode 100644
index 0000000..e9b9e83
--- /dev/null
+++ b/versions/fabric/1.20.1/mods/obe.pw.toml
@@ -0,0 +1,13 @@
+name = "Optimised Block Entities"
+filename = "obe+1.20.1-1.1.1.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/AtOSAunf/versions/VLtpbNku/obe%2B1.20.1-1.1.1.jar"
+hash-format = "sha512"
+hash = "6ac527e3e90c0d2f7e507baa55471a1872e4c3a9079d6c631ce1ed38966cbc7d5742bc400a865fed10251172e87463e4cda90699b7b000f04332b4e6bf692a50"
+
+[update]
+[update.modrinth]
+mod-id = "AtOSAunf"
+version = "VLtpbNku"
diff --git a/versions/fabric/1.20.1/pack.toml b/versions/fabric/1.20.1/pack.toml
index ec055bd..0eed91f 100644
--- a/versions/fabric/1.20.1/pack.toml
+++ b/versions/fabric/1.20.1/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "95dc022f66015b6d2c71ab1e08b8e5eef262c11e533c7c8dbfc52db052869325"
+hash = "5f5b4084517cadc7ffdcb7138aeec59555d78478a95183fcc8dba2addbe13b1a"
 
 [versions]
 fabric = "0.19.3"
diff --git a/versions/fabric/1.21.1/index.toml b/versions/fabric/1.21.1/index.toml
index dcdb4b1..8cbc76b 100644
--- a/versions/fabric/1.21.1/index.toml
+++ b/versions/fabric/1.21.1/index.toml
@@ -141,11 +141,6 @@ file = "mods/ears.pw.toml"
 hash = "1de39da04f5e8ab4595f4c2cd36710bc29a661311c5616e6af6af270d2506aed"
 metafile = true
 
-[[files]]
-file = "mods/ebe.pw.toml"
-hash = "b1f89407254a20cde6c60994a6315bd841b7f562669a1d29b436ec97463ff2ae"
-metafile = true
-
 [[files]]
 file = "mods/entity-model-features.pw.toml"
 hash = "eb8252941ef1fd3cf0eeb8df8d0a77213f33306cd3a64e8fce0f65e1db9ef76e"
@@ -276,6 +271,11 @@ file = "mods/nuit.pw.toml"
 hash = "0846c709603ff778d27f6afe12caa9fedf0648b7d7182a969fd08fe6432b5cc9"
 metafile = true
 
+[[files]]
+file = "mods/obe.pw.toml"
+hash = "878ac462b87b2d1ce74b190571ae3c14e580a8bcc6085834613787d064aac3fd"
+metafile = true
+
 [[files]]
 file = "mods/optigui.pw.toml"
 hash = "6f45c3f2ec9005b18846088784d291f4dabcce7b569031fb44855845a33aa8f7"
diff --git a/versions/fabric/1.21.1/mods/ebe.pw.toml b/versions/fabric/1.21.1/mods/ebe.pw.toml
deleted file mode 100644
index 38944dc..0000000
--- a/versions/fabric/1.21.1/mods/ebe.pw.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Enhanced Block Entities"
-filename = "enhancedblockentities-0.10.2+1.21.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/OVuFYfre/versions/HBZAPs3u/enhancedblockentities-0.10.2%2B1.21.jar"
-hash-format = "sha512"
-hash = "60e01db603fcf1392c0cd5c3ce742e568f7d445d83fe60828b21f546e7d29fb6947231f22d28e29b07f4bdcb767b6dc2a2398b4decea665ecba1166690a44d49"
-
-[update]
-[update.modrinth]
-mod-id = "OVuFYfre"
-version = "HBZAPs3u"
diff --git a/versions/fabric/1.21.1/mods/obe.pw.toml b/versions/fabric/1.21.1/mods/obe.pw.toml
new file mode 100644
index 0000000..e54aa92
--- /dev/null
+++ b/versions/fabric/1.21.1/mods/obe.pw.toml
@@ -0,0 +1,13 @@
+name = "Optimised Block Entities"
+filename = "obe+1.21.1-1.1.1.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/AtOSAunf/versions/RXVaENNR/obe%2B1.21.1-1.1.1.jar"
+hash-format = "sha512"
+hash = "137aad8c97a1263214a926f96a4dddac649ff6cf0db45cd9ccbb0cbb52b252e08038382d17a134fdc31fd0ede398c383bcfb8f8a99ab327ef5442c48d910a0b1"
+
+[update]
+[update.modrinth]
+mod-id = "AtOSAunf"
+version = "RXVaENNR"
diff --git a/versions/fabric/1.21.1/pack.toml b/versions/fabric/1.21.1/pack.toml
index 20e624d..d9ccf26 100644
--- a/versions/fabric/1.21.1/pack.toml
+++ b/versions/fabric/1.21.1/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "ed1266d1286b3845405fad2d7835fc4bae5662c4c22fcae796a23391500b0dfa"
+hash = "51c2759ca4ccdb4fda7ba0a4ee534d43dbf4f346b612660aedc847d61b27b02b"
 
 [versions]
 fabric = "0.19.3"
diff --git a/versions/fabric/1.21.10/index.toml b/versions/fabric/1.21.10/index.toml
index 9b6d991..3d7bfbb 100644
--- a/versions/fabric/1.21.10/index.toml
+++ b/versions/fabric/1.21.10/index.toml
@@ -73,11 +73,6 @@ file = "mods/animaticarefabricated.pw.toml"
 hash = "8e3a4e5d87dbfc3b08ba024d2297d4d745ab73c7d74684bc93cdc0ac55318868"
 metafile = true
 
-[[files]]
-file = "mods/better-block-entities.pw.toml"
-hash = "c8d6bda044475105c02984665f1205537241931d927f825cd8af9699264c1025"
-metafile = true
-
 [[files]]
 file = "mods/c2me-fabric.pw.toml"
 hash = "584dd7457a612ddbbeb429fc4dc2b153807f2538423fd16cae1b92b6274ad296"
@@ -258,6 +253,11 @@ file = "mods/modmenu.pw.toml"
 hash = "1023896f91113c9882d04eca2b072d209bfff4d24e0a306fde992527b56d45ed"
 metafile = true
 
+[[files]]
+file = "mods/obe.pw.toml"
+hash = "d8a46ced552652941644abcaed18065fa3bc7deb916d8352b5f243b5866f0436"
+metafile = true
+
 [[files]]
 file = "mods/optigui.pw.toml"
 hash = "a96d1b2bfb7e9aa08e5f7446b14f4d4253d89cc675bbc285dc8d0dc6095db312"
diff --git a/versions/fabric/1.21.10/mods/better-block-entities.pw.toml b/versions/fabric/1.21.10/mods/better-block-entities.pw.toml
deleted file mode 100644
index 743a2d2..0000000
--- a/versions/fabric/1.21.10/mods/better-block-entities.pw.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Better Block Entities"
-filename = "bbe-1.2.0+1.21.10.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/ONZm0H7Y/versions/r4ORW6Zs/bbe-1.2.0%2B1.21.10.jar"
-hash-format = "sha512"
-hash = "bb1539d9c3202836f70dd02f3e0b011b553f93d178e2107e847be38d14be816201483d4dd98e711c74d02a989b16c89466e401898aed70390bc1bc4e1b13117c"
-
-[update]
-[update.modrinth]
-mod-id = "ONZm0H7Y"
-version = "r4ORW6Zs"
diff --git a/versions/fabric/1.21.10/mods/obe.pw.toml b/versions/fabric/1.21.10/mods/obe.pw.toml
new file mode 100644
index 0000000..61cc025
--- /dev/null
+++ b/versions/fabric/1.21.10/mods/obe.pw.toml
@@ -0,0 +1,13 @@
+name = "Optimised Block Entities"
+filename = "obe+1.21.10-1.1.4.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/AtOSAunf/versions/YLIFSWns/obe%2B1.21.10-1.1.4.jar"
+hash-format = "sha512"
+hash = "5b23eeb3b80049da0a96d3d6eaa215289d0b35855c49abcadca333e30e1073d9d9c3da7f36aa49a9481901685343e7924c58c2cee011f95e8b57cc919d690e29"
+
+[update]
+[update.modrinth]
+mod-id = "AtOSAunf"
+version = "YLIFSWns"
diff --git a/versions/fabric/1.21.10/pack.toml b/versions/fabric/1.21.10/pack.toml
index 982eea8..7f0c712 100644
--- a/versions/fabric/1.21.10/pack.toml
+++ b/versions/fabric/1.21.10/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "47ac9154b386cb4e1564c32665b24ad96fa4ab185c6f275ad1b2f468e31b8206"
+hash = "2c05d2cb6c9a99fa7dcd827074a2532b05b4b466fc9870225891f204dbc26dc5"
 
 [versions]
 fabric = "0.19.3"
diff --git a/versions/fabric/1.21.11/index.toml b/versions/fabric/1.21.11/index.toml
index 57211bf..f51cd86 100644
--- a/versions/fabric/1.21.11/index.toml
+++ b/versions/fabric/1.21.11/index.toml
@@ -73,11 +73,6 @@ file = "mods/animaticarefabricated.pw.toml"
 hash = "8e3a4e5d87dbfc3b08ba024d2297d4d745ab73c7d74684bc93cdc0ac55318868"
 metafile = true
 
-[[files]]
-file = "mods/better-block-entities.pw.toml"
-hash = "b4cd1e372388fadea8346cb3e83ba043bbbb722d139d3ac4e56849c0bb46aade"
-metafile = true
-
 [[files]]
 file = "mods/c2me-fabric.pw.toml"
 hash = "8049628241220dc47909f5d823511b6bf6c8a4cfd7bb212e031ee2acbbd9d7d3"
@@ -258,6 +253,11 @@ file = "mods/modmenu.pw.toml"
 hash = "c3069d6c3ef1d13c9ba064824777c4d74dd504cad358cb0b6f06f6266fc143c8"
 metafile = true
 
+[[files]]
+file = "mods/obe.pw.toml"
+hash = "7de9a17283ddad84e65ecb8d62b842690e5ebe860ed6389cf51d495770fdf82e"
+metafile = true
+
 [[files]]
 file = "mods/optigui.pw.toml"
 hash = "a96d1b2bfb7e9aa08e5f7446b14f4d4253d89cc675bbc285dc8d0dc6095db312"
diff --git a/versions/fabric/1.21.11/mods/better-block-entities.pw.toml b/versions/fabric/1.21.11/mods/better-block-entities.pw.toml
deleted file mode 100644
index 4dab423..0000000
--- a/versions/fabric/1.21.11/mods/better-block-entities.pw.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Better Block Entities"
-filename = "bbe-fabric-1.3.4+mc1.21.11.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/ONZm0H7Y/versions/VTUyYQyY/bbe-fabric-1.3.4%2Bmc1.21.11.jar"
-hash-format = "sha512"
-hash = "1c8a513af8d9694cf9c41765cb8359aa3680ba9a1b8806d99c472ae325597db2c493a0389e602e3cf07b33c938b35012192504d5775c9cd3f308ab8c16376280"
-
-[update]
-[update.modrinth]
-mod-id = "ONZm0H7Y"
-version = "VTUyYQyY"
diff --git a/versions/fabric/1.21.11/mods/obe.pw.toml b/versions/fabric/1.21.11/mods/obe.pw.toml
new file mode 100644
index 0000000..b171f50
--- /dev/null
+++ b/versions/fabric/1.21.11/mods/obe.pw.toml
@@ -0,0 +1,13 @@
+name = "Optimised Block Entities"
+filename = "obe+1.21.11-1.1.4.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/AtOSAunf/versions/FIR4P85p/obe%2B1.21.11-1.1.4.jar"
+hash-format = "sha512"
+hash = "7ab7ee9e9281fc931525eef8518b66962120ab1cbaea878b9e181736aaec9dab5039e35e318c89f2c22d2b211d3535c45a9486c4d26b3434ffd234bacbfe5361"
+
+[update]
+[update.modrinth]
+mod-id = "AtOSAunf"
+version = "FIR4P85p"
diff --git a/versions/fabric/1.21.11/pack.toml b/versions/fabric/1.21.11/pack.toml
index 08cfd8d..930a206 100644
--- a/versions/fabric/1.21.11/pack.toml
+++ b/versions/fabric/1.21.11/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "830801bfe8ffb7e303dcadd4149f895286bc557ceb507d6d527b7e0f8ecfa1cc"
+hash = "8a673ac6e58d16d6bc4018f1ec7c180a81d938b4e19695097650b4883b838698"
 
 [versions]
 fabric = "0.19.3"
diff --git a/versions/fabric/26.1.2/index.toml b/versions/fabric/26.1.2/index.toml
index 775daaf..a69b738 100644
--- a/versions/fabric/26.1.2/index.toml
+++ b/versions/fabric/26.1.2/index.toml
@@ -73,11 +73,6 @@ file = "mods/animaticarefabricated.pw.toml"
 hash = "f41ad1ae9062bffcc37a34c5f637c0bf6269c1cc92b3477fe05488fb80b5d2e4"
 metafile = true
 
-[[files]]
-file = "mods/better-block-entities.pw.toml"
-hash = "809cc13566b4d083a5c6242dafd94c14a65aecab3a8c28933bcbffef38bd9a79"
-metafile = true
-
 [[files]]
 file = "mods/c2me-fabric.pw.toml"
 hash = "ccdf15227c1495a2756b74b8b569a5028d3f30cd4f01b02ea1afa7bd2b0bf841"
@@ -253,6 +248,11 @@ file = "mods/modmenu.pw.toml"
 hash = "42583eed7ccb599f10285e721c25bf3c8858ef7e0eb8e22aa8bf64a08d98a280"
 metafile = true
 
+[[files]]
+file = "mods/obe.pw.toml"
+hash = "2a18fb08f0d3d9aad180ffbe15b13ebd09f31e2634df219c5caf68b07111fbe7"
+metafile = true
+
 [[files]]
 file = "mods/optigui.pw.toml"
 hash = "460aa9c8aaed3845f1c4f31e997991bcc92fafe4d5c25f79255f1e0ddec82eac"
diff --git a/versions/fabric/26.1.2/mods/better-block-entities.pw.toml b/versions/fabric/26.1.2/mods/better-block-entities.pw.toml
deleted file mode 100644
index 7d4a1c3..0000000
--- a/versions/fabric/26.1.2/mods/better-block-entities.pw.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-name = "Better Block Entities"
-filename = "bbe-fabric-1.3.5+mc26.1.2.jar"
-side = "client"
-
-[download]
-url = "https://cdn.modrinth.com/data/ONZm0H7Y/versions/OQG68fGx/bbe-fabric-1.3.5%2Bmc26.1.2.jar"
-hash-format = "sha512"
-hash = "5c43682a4ab319dcd6ad99f3d8a18f49dd6f46b0c195cb06a200df1dd492c7a78837a3ec5a49b05203f64dacd0aea800870a6f2e1f31904348abf22c79eabfb2"
-
-[update]
-[update.modrinth]
-mod-id = "ONZm0H7Y"
-version = "OQG68fGx"
diff --git a/versions/fabric/26.1.2/mods/obe.pw.toml b/versions/fabric/26.1.2/mods/obe.pw.toml
new file mode 100644
index 0000000..42c9729
--- /dev/null
+++ b/versions/fabric/26.1.2/mods/obe.pw.toml
@@ -0,0 +1,13 @@
+name = "Optimised Block Entities"
+filename = "obe+26.1.2-1.1.4.jar"
+side = "client"
+
+[download]
+url = "https://cdn.modrinth.com/data/AtOSAunf/versions/SHecTyAB/obe%2B26.1.2-1.1.4.jar"
+hash-format = "sha512"
+hash = "a18c265f5ae7b5f6b445bbb6797d92ad1566ce9e6ed6f3fdb2cee442fe0c431f1cd826515471918a54b6350d3977984b51bb8af59bfa854628835efaab601e21"
+
+[update]
+[update.modrinth]
+mod-id = "AtOSAunf"
+version = "SHecTyAB"
diff --git a/versions/fabric/26.1.2/pack.toml b/versions/fabric/26.1.2/pack.toml
index 0dc3cda..19bbd2d 100644
--- a/versions/fabric/26.1.2/pack.toml
+++ b/versions/fabric/26.1.2/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "9fbdd7b3a1218666495a667d644ada1cf7d9a484ed50d322a09a54499db0f8e6"
+hash = "196e80dd1565b974a27bc96cd473dfb2a19e98e1eca6f4664667dfea733cccdf"
 
 [versions]
 fabric = "0.19.3"