diff --git a/gradle.properties b/gradle.properties
index 2c9e0c6a..bbeaf635 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=1.14.2 Pre-Release 2
-	yarn_mappings=1.14.2 Pre-Release 2+build.2
-	loader_version=0.4.7+build.147
+	minecraft_version=1.14.2 Pre-Release 3
+	yarn_mappings=1.14.2 Pre-Release 3+build.3
+	loader_version=0.4.7+build.153
 
 # Mod Properties
 	mod_version = 1.0.0
@@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric
-	#fabric_version=0.3.0-pre+build.156
+	#fabric_version=0.3.0-pre+build.166
diff --git a/src/main/java/carpet/mixins/PrimedTntEntityMixin.java b/src/main/java/carpet/mixins/TntEntityMixin.java
similarity index 85%
rename from src/main/java/carpet/mixins/PrimedTntEntityMixin.java
rename to src/main/java/carpet/mixins/TntEntityMixin.java
index 648f31ce..94ae0178 100644
--- a/src/main/java/carpet/mixins/PrimedTntEntityMixin.java
+++ b/src/main/java/carpet/mixins/TntEntityMixin.java
@@ -4,7 +4,7 @@ import carpet.CarpetSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.PrimedTntEntity;
+import net.minecraft.entity.TntEntity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
@@ -15,18 +15,18 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import carpet.logging.LoggerRegistry;
 import carpet.logging.logHelpers.TNTLogHelper;
 
-@Mixin(PrimedTntEntity.class)
-public abstract class PrimedTntEntityMixin extends Entity
+@Mixin(TntEntity.class)
+public abstract class TntEntityMixin extends Entity
 {
     private TNTLogHelper logHelper = null;
 
-    public PrimedTntEntityMixin(EntityType<?> entityType_1, World world_1)
+    public TntEntityMixin(EntityType<?> entityType_1, World world_1)
     {
         super(entityType_1, world_1);
     }
 
     @Inject(method = "<init>(Lnet/minecraft/entity/EntityType;Lnet/minecraft/world/World;)V", at = @At("RETURN"))
-    private void initTNTLoggerPrime(EntityType<? extends PrimedTntEntity> entityType_1, World world_1, CallbackInfo ci)
+    private void initTNTLoggerPrime(EntityType<? extends TntEntity> entityType_1, World world_1, CallbackInfo ci)
     {
         if (LoggerRegistry.__tnt && !world_1.isClient)
         {
diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java
index a781ea5b..c7f90dc9 100644
--- a/src/main/java/carpet/script/CarpetExpression.java
+++ b/src/main/java/carpet/script/CarpetExpression.java
@@ -554,7 +554,7 @@ public class CarpetExpression
         });
 
         this.expr.addLazyFunction("solid", -1, (c, t, lv) ->
-                booleanStateTest(c, "solid", lv, (s, p) -> s.isFullBoundsCubeForCulling()));
+                genericStateTest(c, "solid", lv, (s, p, w) -> new NumericValue(s.isSimpleFullBlock(w, p))));
 
         this.expr.addLazyFunction("air", -1, (c, t, lv) ->
                 booleanStateTest(c, "air", lv, (s, p) -> s.isAir()));
diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java
index 7918b24b..209f4685 100644
--- a/src/main/java/carpet/utils/BlockInfo.java
+++ b/src/main/java/carpet/utils/BlockInfo.java
@@ -170,7 +170,6 @@ public class BlockInfo
         //lst.add(Messenger.s(String.format(" - Full block: %s", block.isShapeFullCube()))); //  isFullCube() )));
         lst.add(Messenger.s(String.format(" - Normal cube: %s", state.isSimpleFullBlock(world, pos)))); //isNormalCube())));
         lst.add(Messenger.s(String.format(" - Is liquid: %s", material.isLiquid())));
-        lst.add(Messenger.s(String.format(" - Is solid: %s", state.isFullBoundsCubeForCulling())));
         lst.add(Messenger.s(""));
         lst.add(Messenger.s(String.format(" - Light in: %d, above: %d", world.getLightLevel(pos), world.getLightLevel(pos.up()))));
         lst.add(Messenger.s(String.format(" - Brightness in: %.2f, above: %.2f", world.getBrightness(pos), world.getBrightness(pos.up()))));
diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json
index 2d5dff2d..12cba0c2 100644
--- a/src/main/resources/carpet.mixins.json
+++ b/src/main/resources/carpet.mixins.json
@@ -60,7 +60,7 @@
     "TntBlockMixin",
     "ExplosionMixin",
 
-    "PrimedTntEntityMixin",
+    "TntEntityMixin",
     "ProjectileEntityMixin",
     "FallingBlockEntityMixin",
     "ThrownEntityMixin",