diff --git a/build.gradle b/build.gradle
index 3b31088..6ddce27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle'
 
 group = 'com.buuz135'
-version = '1.18.2-0.0.20'
+version = '1.18.2-1.0.0'
 
 java {
     archivesBaseName = 'functionalstorage'
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
index a40068f..71e4b4c 100644
--- a/src/generated/resources/.cache/cache
+++ b/src/generated/resources/.cache/cache
@@ -30,7 +30,7 @@ a50aeb3877dd4003bb3ed359fccde1f3674bc028 assets/functionalstorage/blockstates/sp
 fbf8ebd85350f3b4ad0bf6faf51f9ecf0677bf5b assets/functionalstorage/blockstates/warped_1.json
 bcd4b5e128d5175bea44ecae340aeec86cd5a123 assets/functionalstorage/blockstates/warped_2.json
 ebc4aebffb44baa4dd507078b9fd3c74e881f4c1 assets/functionalstorage/blockstates/warped_4.json
-5d88a81b6ba32567a762bd76ead3945971ac78e2 assets/functionalstorage/lang/en_us.json
+5dc7383bb1c5687debef79e8a194c6e74be6ffd5 assets/functionalstorage/lang/en_us.json
 68c3f6a8fe55202f83c0fcdd6c8ca10ef88019ef assets/functionalstorage/models/block/acacia_1_locked.json
 c7d0376ba2a080ba12c344369ad11538899db176 assets/functionalstorage/models/block/acacia_2_locked.json
 79b86baeec4aa6784aa52028d2f3bc98ddab8c14 assets/functionalstorage/models/block/acacia_4_locked.json
@@ -152,7 +152,7 @@ d6b02c345edd356b8e4b7421bdd453f454c6ed7f data/functionalstorage/recipes/storage_
 bcb281904eac23183c45786e3d703d24bba92be6 data/functionalstorage/recipes/warped_1.json
 91e56e4558ed55571e9972bca1e8a1772655abdd data/functionalstorage/recipes/warped_2.json
 344de1ec16ecf9095fd5790c1c60a4014520829e data/functionalstorage/recipes/warped_4.json
-34d82556c1781b4ce5da2773e22edc2589d629e8 data/functionalstorage/tags/items/drawer.json
+c63c5aa611d526d477655c15e0431da738d17e21 data/functionalstorage/tags/items/drawer.json
 486a80437ce84b27a3d93db5134ea1fb4f66401f data/functionalstorage/tags/items/ignore_crafting_check.json
-34d82556c1781b4ce5da2773e22edc2589d629e8 data/minecraft/tags/blocks/mineable/axe.json
+c63c5aa611d526d477655c15e0431da738d17e21 data/minecraft/tags/blocks/mineable/axe.json
 2c1ca62408eae8963178024550b0771101e01d53 data/minecraft/tags/blocks/mineable/pickaxe.json
diff --git a/src/generated/resources/assets/functionalstorage/lang/en_us.json b/src/generated/resources/assets/functionalstorage/lang/en_us.json
index 7f8fb24..d13f233 100644
--- a/src/generated/resources/assets/functionalstorage/lang/en_us.json
+++ b/src/generated/resources/assets/functionalstorage/lang/en_us.json
@@ -7,6 +7,7 @@
   "block.functionalstorage.birch_2": "Birch Drawer (1x2)",
   "block.functionalstorage.birch_4": "Birch Drawer (2x2)",
   "block.functionalstorage.compacting_drawer": "Compacting Drawer",
+  "block.functionalstorage.compacting_framed_drawer": "Framed Compacting Drawer",
   "block.functionalstorage.crimson_1": "Crimson Drawer (1x1)",
   "block.functionalstorage.crimson_2": "Crimson Drawer (1x2)",
   "block.functionalstorage.crimson_4": "Crimson Drawer (2x2)",
diff --git a/src/generated/resources/data/functionalstorage/tags/items/drawer.json b/src/generated/resources/data/functionalstorage/tags/items/drawer.json
index d12f435..823a43d 100644
--- a/src/generated/resources/data/functionalstorage/tags/items/drawer.json
+++ b/src/generated/resources/data/functionalstorage/tags/items/drawer.json
@@ -10,15 +10,6 @@
     "functionalstorage:crimson_4",
     "functionalstorage:warped_4",
     "functionalstorage:framed_4",
-    "functionalstorage:oak_2",
-    "functionalstorage:spruce_2",
-    "functionalstorage:birch_2",
-    "functionalstorage:jungle_2",
-    "functionalstorage:acacia_2",
-    "functionalstorage:dark_oak_2",
-    "functionalstorage:crimson_2",
-    "functionalstorage:warped_2",
-    "functionalstorage:framed_2",
     "functionalstorage:oak_1",
     "functionalstorage:spruce_1",
     "functionalstorage:birch_1",
@@ -27,6 +18,15 @@
     "functionalstorage:dark_oak_1",
     "functionalstorage:crimson_1",
     "functionalstorage:warped_1",
-    "functionalstorage:framed_1"
+    "functionalstorage:framed_1",
+    "functionalstorage:oak_2",
+    "functionalstorage:spruce_2",
+    "functionalstorage:birch_2",
+    "functionalstorage:jungle_2",
+    "functionalstorage:acacia_2",
+    "functionalstorage:dark_oak_2",
+    "functionalstorage:crimson_2",
+    "functionalstorage:warped_2",
+    "functionalstorage:framed_2"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
index d12f435..823a43d 100644
--- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
+++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
@@ -10,15 +10,6 @@
     "functionalstorage:crimson_4",
     "functionalstorage:warped_4",
     "functionalstorage:framed_4",
-    "functionalstorage:oak_2",
-    "functionalstorage:spruce_2",
-    "functionalstorage:birch_2",
-    "functionalstorage:jungle_2",
-    "functionalstorage:acacia_2",
-    "functionalstorage:dark_oak_2",
-    "functionalstorage:crimson_2",
-    "functionalstorage:warped_2",
-    "functionalstorage:framed_2",
     "functionalstorage:oak_1",
     "functionalstorage:spruce_1",
     "functionalstorage:birch_1",
@@ -27,6 +18,15 @@
     "functionalstorage:dark_oak_1",
     "functionalstorage:crimson_1",
     "functionalstorage:warped_1",
-    "functionalstorage:framed_1"
+    "functionalstorage:framed_1",
+    "functionalstorage:oak_2",
+    "functionalstorage:spruce_2",
+    "functionalstorage:birch_2",
+    "functionalstorage:jungle_2",
+    "functionalstorage:acacia_2",
+    "functionalstorage:dark_oak_2",
+    "functionalstorage:crimson_2",
+    "functionalstorage:warped_2",
+    "functionalstorage:framed_2"
   ]
 }
\ No newline at end of file
diff --git a/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java b/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java
index 50efaae..9a0bba9 100644
--- a/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java
+++ b/src/main/java/com/buuz135/functionalstorage/data/FunctionalStorageLangProvider.java
@@ -28,7 +28,8 @@ public class FunctionalStorageLangProvider extends LanguageProvider {
             }
         }
         this.add(FunctionalStorage.COMPACTING_DRAWER.getLeft().get(), "Compacting Drawer");
-        this.add(FunctionalStorage.ENDER_DRAWER.getLeft().get(), "Ender Drawer" );
+        this.add(FunctionalStorage.FRAMED_COMPACTING_DRAWER.getLeft().get(), "Framed Compacting Drawer");
+        this.add(FunctionalStorage.ENDER_DRAWER.getLeft().get(), "Ender Drawer");
         this.add("linkingtool.linkingmode", "Linking Mode: ");
         this.add("linkingtool.linkingmode.single", "Single");
         this.add("linkingtool.linkingmode.single.desc", "Links a drawer to a controller");