Revert "Merge branch 'trunk' into server"

This reverts commit 98ffe11, reversing
changes made to 1b66f2d.

config/enchancement.json

@@ -1,27 +1,64 @@
 {
- "allowedEnchantments": [],
- "invertedList": true,
- "overhaulEnchantingTable": false,
+ "allowedEnchantments": [
+ "enchancement:assimilation",
+ "enchancement:perception",
+ "enchancement:veil",
+ "enchancement:amphibious",
+ "enchancement:strafe",
+ "enchancement:wardenspine",
+ "enchancement:dash",
+ "enchancement:slide",
+ "enchancement:bouncy",
+ "enchancement:buoy",
+ "enchancement:gale",
+ "enchancement:berserk",
+ "minecraft:fire_aspect",
+ "enchancement:frostbite",
+ "minecraft:infinity",
+ "enchancement:chaos",
+ "enchancement:delay",
+ "enchancement:phasing",
+ "enchancement:brimstone",
+ "enchancement:scatter",
+ "enchancement:torch",
+ "minecraft:channeling",
+ "enchancement:leech",
+ "minecraft:riptide",
+ "enchancement:warp",
+ "enchancement:extracting",
+ "enchancement:molten",
+ "enchancement:beheading",
+ "enchancement:lumberjack",
+ "enchancement:bury",
+ "enchancement:scooping",
+ "enchancement:disarm",
+ "enchancement:grapple",
+ "minecraft:luck_of_the_sea",
+ "minecraft:efficiency",
+ "minecraft:silk_touch"
+ ],
+ "invertedList": false,
+ "overhaulEnchantingTable": true,
  "allowTreasureEnchantmentsInEnchantingTable": false,
- "singleEnchantmentMode": false,
- "singleLevelMode": false,
- "allowInfinityOnCrossbows": false,
- "allTridentsHaveLoyalty": false,
- "channelingIgnitesOnMelee": false,
- "channelingWorksWhenNotThundering": false,
- "fireAspectWorksAsFlintAndSteel": false,
- "freeEnchantedBookMerging": false,
- "luckOfTheSeaHasLure": false,
- "negateEnderPearlDamage": false,
+ "singleEnchantmentMode": true,
+ "singleLevelMode": true,
+ "allowInfinityOnCrossbows": true,
+ "allTridentsHaveLoyalty": true,
+ "channelingIgnitesOnMelee": true,
+ "channelingWorksWhenNotThundering": true,
+ "fireAspectWorksAsFlintAndSteel": true,
+ "freeEnchantedBookMerging": true,
+ "luckOfTheSeaHasLure": true,
+ "negateEnderPearlDamage": true,
  "safeChanneling": true,
  "tridentsReturnFromVoid": true,
- "weakerFireAspect": false,
- "weakerGoldenApple": false,
- "weakerPotions": false,
+ "weakerFireAspect": true,
+ "weakerGoldenApple": true,
+ "weakerPotions": true,
  "weaponEnchantmentCooldownRequirement": 0.7,
  "maxExtractingBlocks": 64,
  "maxLumberjackBlocks": 1024,
  "maxLumberjackHorizontalLength": 7,
- "unbreakingChangesFlag": -1,
+ "unbreakingChangesFlag": 1,
  "enchantmentDescriptions": true
-}
+}

index.toml

@@ -1,16 +1,12 @@
 hash-format = "sha256"
 
-[[files]]
-file = "config/betterenchantmentboosting.json"
-hash = "a83dcb19902cadb61eb979e2730f3b6ce1ae7f2d3a31a80e52c38245f597b4cd"
-
 [[files]]
 file = "config/controlify.json"
 hash = "1850aed3abd027e74c7ab1f9872ea0cdd8029eeb1157e4eef6c250036abba29a"
 
 [[files]]
 file = "config/enchancement.json"
-hash = "8319f37cca33825e2eb9bb30f463c6c1cd5bb3f8e6f74b660ea1bf15c95c20a9"
+hash = "552967d81e4f24af805d75fcea6e8ae892cfe05296eaf8f5a6c136ab7e58cd1e"
 
 [[files]]
 file = "config/extended_drawers.json"
@@ -187,11 +183,6 @@ file = "mods/banhammer.pw.toml"
 hash = "27b096c8d024c3c935c4c8f099da3516f0a111e61f2e36a995a79b3f9c08dd53"
 metafile = true
 
-[[files]]
-file = "mods/bc23enchantmentbridge.pw.toml"
-hash = "1281252e064d1ba35c4e6fab379ccbddeda0043300f0c0d542fce8914774599d"
-metafile = true
-
 [[files]]
 file = "mods/better-climbing.pw.toml"
 hash = "7da0c9deaa53f551129de9ff7ad2d2c28331ab938c8da1f4d22a25330dd1425a"

pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "923695aa6bd50fecf25eab944acc79856bbb81a0f3db270b16574b0700edcaf3"
+hash = "b91b24e51f585aae3b4bf68b3310b964e024c668f3b91a6cfe07051ddb995a5f"
 
 [versions]
 minecraft = "1.20.1"