diff --git a/build.gradle b/build.gradle
index ef72382cd..8371e1ebf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,7 @@
 
         server {
             workingDirectory project.file("run/server-${mc_version}")
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
 
             mods {
@@ -60,7 +60,7 @@
 
         data {
             workingDirectory project.file('run')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
 
             args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
diff --git a/gradle.properties b/gradle.properties
index c5ee4ae3b..a4a22ade3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Mod properties
-mod_version=1.87.0
+mod_version=1.87.1
 
 # Minecraft properties (update mods.toml when changing)
 mc_version=1.15.2
diff --git a/src/generated/resources/data/computercraft/loot_tables/computer_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
similarity index 95%
rename from src/generated/resources/data/computercraft/loot_tables/computer_advanced.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
index 09dac48f6..74fb9c725 100644
--- a/src/generated/resources/data/computercraft/loot_tables/computer_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/computer_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
similarity index 95%
rename from src/generated/resources/data/computercraft/loot_tables/computer_normal.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
index 09dac48f6..74fb9c725 100644
--- a/src/generated/resources/data/computercraft/loot_tables/computer_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/disk_drive.json b/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/disk_drive.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
index 675f3cf78..4bd0f0ea2 100644
--- a/src/generated/resources/data/computercraft/loot_tables/disk_drive.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
index e5c1b82b1..21e4fc349 100644
--- a/src/generated/resources/data/computercraft/loot_tables/monitor_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/monitor_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/monitor_normal.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
index f27f7adcf..3e4d5df59 100644
--- a/src/generated/resources/data/computercraft/loot_tables/monitor_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/printer.json b/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/printer.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
index c632c9d67..e401a994b 100644
--- a/src/generated/resources/data/computercraft/loot_tables/printer.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/printer.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/speaker.json b/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/speaker.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
index 5b6d03f9a..90e5773e3 100644
--- a/src/generated/resources/data/computercraft/loot_tables/speaker.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
similarity index 95%
rename from src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
index 09dac48f6..74fb9c725 100644
--- a/src/generated/resources/data/computercraft/loot_tables/turtle_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/turtle_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json
similarity index 95%
rename from src/generated/resources/data/computercraft/loot_tables/turtle_normal.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json
index 09dac48f6..74fb9c725 100644
--- a/src/generated/resources/data/computercraft/loot_tables/turtle_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
index 02bd68624..cb2b02189 100644
--- a/src/generated/resources/data/computercraft/loot_tables/wired_modem_full.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
index 4f46d4b0f..03e30c572 100644
--- a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_advanced.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
similarity index 91%
rename from src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json
rename to src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
index a9fdb21e7..30c49f858 100644
--- a/src/generated/resources/data/computercraft/loot_tables/wireless_modem_normal.json
+++ b/src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json
@@ -1,4 +1,5 @@
 {
+  "type": "minecraft:block",
   "pools": [
     {
       "name": "main",
diff --git a/src/main/java/dan200/computercraft/data/LootTables.java b/src/main/java/dan200/computercraft/data/LootTables.java
index f40295ccc..02db8551e 100644
--- a/src/main/java/dan200/computercraft/data/LootTables.java
+++ b/src/main/java/dan200/computercraft/data/LootTables.java
@@ -45,8 +45,9 @@ protected void registerLoot( BiConsumer<ResourceLocation, LootTable> add )
 
     private static void basicDrop( BiConsumer<ResourceLocation, LootTable> add, Block block )
     {
-        add.accept( block.getRegistryName(), LootTable
+        add.accept( block.getLootTable(), LootTable
             .builder()
+            .setParameterSet( LootParameterSets.BLOCK )
             .addLootPool( LootPool.builder()
                 .name( "main" )
                 .rolls( ConstantRange.of( 1 ) )
@@ -57,8 +58,9 @@ private static void basicDrop( BiConsumer<ResourceLocation, LootTable> add, Bloc
 
     private static void computerDrop( BiConsumer<ResourceLocation, LootTable> add, Block block )
     {
-        add.accept( block.getRegistryName(), LootTable
+        add.accept( block.getLootTable(), LootTable
             .builder()
+            .setParameterSet( LootParameterSets.BLOCK )
             .addLootPool( LootPool.builder()
                 .name( "main" )
                 .rolls( ConstantRange.of( 1 ) )
diff --git a/src/main/resources/data/computercraft/lua/rom/help/changelog.txt b/src/main/resources/data/computercraft/lua/rom/help/changelog.txt
index 3afe2d05f..5360045ad 100644
--- a/src/main/resources/data/computercraft/lua/rom/help/changelog.txt
+++ b/src/main/resources/data/computercraft/lua/rom/help/changelog.txt
@@ -1,3 +1,7 @@
+# New features in CC: Tweaked 1.87.1
+
+* Fix blocks not dropping items in survival.
+
 # New features in CC: Tweaked 1.87.0
 
 * Add documentation to many Lua functions. This is published online at https://tweaked.cc/.
diff --git a/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt b/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt
index 952c5605b..02ec15e80 100644
--- a/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt
+++ b/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt
@@ -1,31 +1,5 @@
-New features in CC: Tweaked 1.87.0
+New features in CC: Tweaked 1.87.1
 
-* Add documentation to many Lua functions. This is published online at https://tweaked.cc/.
-* Replace to pretty-printer in the Lua REPL. It now supports displaying functions and recursive tables. This printer is may be used within your own code through the `cc.pretty` module.
-* Add `fs.getCapacity`. A complement to `fs.getFreeSpace`, this returns the capacity of the supplied drive.
-* Add `fs.getAttributes`. This provides file size and type, as well as creation and modification time.
-* Update Cobalt version. This backports several features from Lua 5.2 and 5.3:
-  - The `__len` metamethod may now be used by tables.
-  - Add `\z`, hexadecimal (`\x00`) and unicode (`\u0000`) string escape codes.
-  - Add `utf8` lib.
-  - Mirror Lua's behaviour of tail calls more closely. Native functions are no longer tail called, and tail calls are displayed in the stack trace.
-  - `table.unpack` now uses `__len` and `__index` metamethods.
-  - Parser errors now include the token where the error occured.
-* Add `textutils.unserializeJSON`. This can be used to decode standard JSON and stringified-NBT.
-* The `settings` API now allows "defining" settings. This allows settings to specify a default value and description.
-* Enable the motd on non-pocket computers.
-* Allow using the menu with the mouse in edit and paint (JakobDev).
-* Add Danish and Korean translations (ChristianLW, mindy15963)
-* Fire `mouse_up` events in the monitor program.
-* Allow specifying a timeout to `websocket.receive`.
-* Increase the maximimum limit for websocket messages.
-* Optimise capacity checking of computer/disk folders.
-
-And several bug fixes:
-* Fix turtle texture being incorrectly oriented (magiczocker10).
-* Prevent copying folders into themselves.
-* Normalise file paths within shell.setDir (JakobDev)
-* Fix turtles treating waterlogged blocks as water.
-* Register an entity renderer for the turtle's fake player.
+* Fix blocks not dropping items in survival.
 
 Type "help changelog" to see the full version history.