diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt
index 2be83740..cb2783b5 100644
--- a/DynmapCore/src/main/resources/models_1.txt
+++ b/DynmapCore/src/main/resources/models_1.txt
@@ -1471,30 +1471,30 @@ patchblock:id=bubble_column
 [1.14-]patchrotate:id=smoker,data=0,roty=270
 [1.14-]patchblock:id=smoker,id=blast_furnace,data=6,data=7
 [1.14-]patchrotate:id=smoker,data=0,roty=90
-# Grindstone
-[1.14-]boxlist:id=grindstone,data=0,box=0.75:0.875:0:0.4375:0.375:0.625:4/-1/4/4/4/4,box=0.125:0.25:0:0.4375:0.375:0.625:4/-1/4/4/4,box=0.125:0.875:0.4375:0.8325:0.3125:0.6875:4/4/4/4/4/4,box=0.25:0.75:0.25:1:0.125:0.875:5/5/2/2/1/1
-[1.14-]patchblock:id=grindstone,data=1
-[1.14-]patchrotate:id=grindstone,data=0,roty=180
-[1.14-]patchblock:id=grindstone,data=2
-[1.14-]patchrotate:id=grindstone,data=0,roty=270
-[1.14-]patchblock:id=grindstone,data=3
-[1.14-]patchrotate:id=grindstone,data=0,roty=90
-[1.14-]patchblock:id=grindstone,data=4
-[1.14-]patchrotate:id=grindstone,data=0,rotx=90
-[1.14-]patchblock:id=grindstone,data=5
-[1.14-]patchrotate:id=grindstone,data=0,rotx=90,roty=180
-[1.14-]patchblock:id=grindstone,data=6
-[1.14-]patchrotate:id=grindstone,data=0,rotx=90,roty=270
-[1.14-]patchblock:id=grindstone,data=7
-[1.14-]patchrotate:id=grindstone,data=0,rotx=90,roty=90
-[1.14-]patchblock:id=grindstone,data=8
-[1.14-]patchrotate:id=grindstone,data=0,rotx=180
-[1.14-]patchblock:id=grindstone,data=9
-[1.14-]patchrotate:id=grindstone,data=0,rotx=180,roty=180
-[1.14-]patchblock:id=grindstone,data=10
-[1.14-]patchrotate:id=grindstone,data=0,rotx=180,roty=90
-[1.14-]patchblock:id=grindstone,data=11
-[1.14-]patchrotate:id=grindstone,data=0,rotx=180,roty=270
+# Grindstone (grindstone_pivot, grindstone_round, grindstone_side, dark_oak_log)
+[1.14-]modellist:id=grindstone,state=face:floor/facing:north,box=12/0/6:14/7/10:n/3/2/9/4/16:e/3/10/16/6/9:s/3/12/9/14/16:w/3/6/9/10/16:d/3/12/6/14/10,box=2/0/6:4/7/10:n/3/12/9/14/16:e/3/10/16/6/9:s/3/2/9/4/16:w/3/6/9/10/16:d/3/2/6/4/10,box=12/7/5:14/13/11:n/0/6/0/8/6:e/0/0/0/6/6:s/0/6/0/8/6:u/0/8/0/10/6:d/0/8/0/16/6,box=2/7/5:4/13/11:n/0/6/0/8/6:s/0/6/0/8/6:w/0/0/0/6/6:u/0/8/0/10/6:d/0/8/0/10/6,box=4/4/2:12/16/14:n/1/0/0/8/12:e/2/0/0/12/12:s/1/0/0/8/12:w/2/0/0/12/12:u/1/0/0/8/12:d/1/0/0/8/12
+[1.14-]patchblock:id=grindstone,state=face:floor/facing:south
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,roty=180
+[1.14-]patchblock:id=grindstone,state=face:floor/facing:west
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,roty=270
+[1.14-]patchblock:id=grindstone,state=face:floor/facing:east
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,roty=90
+[1.14-]patchblock:id=grindstone,state=face:wall/facing:north
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,rotx=90
+[1.14-]patchblock:id=grindstone,state=face:wall/facing:south
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,rotx=90,roty=180
+[1.14-]patchblock:id=grindstone,state=face:wall/facing:west
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,rotx=90,roty=270
+[1.14-]patchblock:id=grindstone,state=face:wall/facing:east
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,rotx=90,roty=90
+[1.14-]patchblock:id=grindstone,state=face:ceiling/facing:north
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,rotx=180
+[1.14-]patchblock:id=grindstone,state=face:ceiling/facing:south
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,rotx=180,roty=180
+[1.14-]patchblock:id=grindstone,state=face:ceiling/facing:west
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,rotx=180,roty=90
+[1.14-]patchblock:id=grindstone,state=face:ceiling/facing:east
+[1.14-]patchrotate:id=grindstone,state=face:floor/facing:north,rotx=180,roty=270
 # Lectern
 [1.14-]boxlist:id=lectern,data=0,data=1,data=2,data=3,box=0:1:0:0.125:0:1:0/1/1/1/1/1,box=0.25:0.75:0.125:0.9375:0.25:0.75:-1/-1/3/3/2/2,box=0.01:0.99:0.75:1:0.1875:1:0/4/3/3/3/3
 [1.14-]patchblock:id=lectern,data=4,data=5,data=6,data=7
diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt
index 3e62042d..7bb746ee 100644
--- a/DynmapCore/src/main/resources/texture_1.txt
+++ b/DynmapCore/src/main/resources/texture_1.txt
@@ -2106,9 +2106,9 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b
 [1.14-]texture:id=sweet_berry_bush_stage1
 [1.14-]texture:id=sweet_berry_bush_stage2
 [1.14-]texture:id=sweet_berry_bush_stage3
-[1.14-]texture:id=grindstone_pivot,format=CUSTOM,tile0=0:0/10:6:3:5,tile1=0:0/10:6:4:5,xcount=1,ycount=1
-[1.14-]texture:id=grindstone_round,format=CUSTOM,tile0=0:0/8:12/4:0,tile1=0:0/8:12/4:2,xcount=1,ycount=1
-[1.14-]texture:id=grindstone_side,format=CUSTOM,tile0=0:0/12:12/2:0,xcount=1,ycount=1
+[1.14-]texture:id=grindstone_pivot
+[1.14-]texture:id=grindstone_round
+[1.14-]texture:id=grindstone_side
 [1.14-]texture:id=lectern_base
 [1.14-]texture:id=lectern_front
 [1.14-]texture:id=lectern_sides
@@ -2288,8 +2288,8 @@ block:id=black_banner,id=black_wall_banner,data=*,patch0=0:oak_planks,patch1=0:b
 [1.14-]block:id=sweet_berry_bush,data=1,patch0-1=0:sweet_berry_bush_stage1,transparency=TRANSPARENT
 [1.14-]block:id=sweet_berry_bush,data=2,patch0-1=0:sweet_berry_bush_stage2,transparency=TRANSPARENT
 [1.14-]block:id=sweet_berry_bush,data=3,patch0-1=0:sweet_berry_bush_stage3,transparency=TRANSPARENT
-# Grindstone
-[1.14-]block:id=grindstone,patch0=6000:grindstone_pivot,patch1=0:grindstone_round,patch2=0:grindstone_side,patch4=0:dark_oak_log,patch5=1:grindstone_round,patch6=6001:grindstone_pivot,transparency=TRANSPARENT
+# Grindstone (grindstone_pivot, grindstone_round, grindstone_side, dark_oak_log)
+[1.14-]block:id=grindstone,patch0=0:grindstone_pivot,patch1=0:grindstone_round,patch2=0:grindstone_side,patch3=0:dark_oak_log,transparency=TRANSPARENT
 # Lectern
 [1.14-]block:id=lectern,patch0=0:oak_planks,patch1=0:lectern_base,patch2=0:lectern_front,patch3=0:lectern_sides,patch4=0:lectern_top,transparency=TRANSPARENT
 # Lantern