diff --git a/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java b/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java
index c48837f29..3a9571a69 100644
--- a/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java
+++ b/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java
@@ -1,5 +1,6 @@
 package dan200.computercraft.client.gui;
 
+import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -23,14 +24,14 @@ public abstract class ComputerScreenBase <T extends ContainerComputerBase> exten
     protected final ClientComputer computer;
     protected final ComputerFamily family;
 
-    protected final int sidebarYOffset = 0;
+    protected final int sidebarYOffset;
 
     public ComputerScreenBase(T container, PlayerInventory player, Text title, int sidebarYOffset )
     {
         super( container, player, title );
         computer = (ClientComputer) container.getComputer();
         family = container.getFamily();
-//        this.sidebarYOffset = sidebarYOffset;
+        this.sidebarYOffset = sidebarYOffset;
     }
 
     protected abstract WidgetTerminal createTerminal();
@@ -42,7 +43,7 @@ public abstract class ComputerScreenBase <T extends ContainerComputerBase> exten
         client.keyboard.setRepeatEvents( true );
 
         terminal = addDrawableChild( createTerminal() );
-//        ComputerSidebar.addButtons( this, computer, this::addButton, leftPos, topPos + sidebarYOffset );
+        ComputerSidebar.addButtons( this, computer, this::addDrawableChild, x, y + sidebarYOffset );
         setFocused( terminal );
     }
 
diff --git a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
index 79534ab71..609d68edb 100644
--- a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
@@ -6,29 +6,23 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
-import dan200.computercraft.client.gui.widgets.WidgetWrapper;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.client.render.RenderTypes;
-import dan200.computercraft.shared.computer.core.ClientComputer;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
-import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nonnull;
 
-import java.util.List;
-
-import static dan200.computercraft.client.render.ComputerBorderRenderer.*;
+import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
+import static dan200.computercraft.client.render.ComputerBorderRenderer.getTexture;
 
 public final class GuiComputer<T extends ContainerComputerBase> extends ComputerScreenBase<T>
 {
@@ -41,7 +35,7 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
         this.termWidth = termWidth;
         this.termHeight = termHeight;
 
-        backgroundWidth = WidgetTerminal.getWidth( termWidth ) + BORDER * 2;
+        backgroundWidth = WidgetTerminal.getWidth( termWidth ) + BORDER * 2 + ComputerSidebar.WIDTH;
         backgroundHeight = WidgetTerminal.getHeight( termHeight ) + BORDER * 2;
     }
 
@@ -64,7 +58,7 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
     protected WidgetTerminal createTerminal()
     {
         return new WidgetTerminal( computer,
-            x + BORDER, y + BORDER, termWidth, termHeight
+            x + ComputerSidebar.WIDTH + BORDER, y + BORDER, termWidth, termHeight
         );
     }
     @Override
@@ -73,5 +67,6 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
         ComputerBorderRenderer.render(
             getTexture(family), terminal.x, terminal.y, getZOffset(),
             RenderTypes.FULL_BRIGHT_LIGHTMAP, terminal.getWidth(), terminal.getHeight() );
+        ComputerSidebar.renderBackground( stack, x, y + sidebarYOffset );
     }
 }
diff --git a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
index acbc78776..56dd0b1be 100644
--- a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
@@ -8,6 +8,7 @@ package dan200.computercraft.client.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -36,7 +37,7 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
         super( container, player, title, BORDER );
 
         family = container.getFamily();
-        backgroundWidth = TEX_WIDTH;
+        backgroundWidth = TEX_WIDTH + ComputerSidebar.WIDTH;
         backgroundHeight = TEX_HEIGHT;
 
     }
@@ -45,7 +46,7 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
     protected WidgetTerminal createTerminal()
     {
         return new WidgetTerminal(
-            computer, x + BORDER, y + BORDER,
+            computer, x + BORDER + ComputerSidebar.WIDTH, y + BORDER,
             ComputerCraft.turtleTermWidth, ComputerCraft.turtleTermHeight
         );
     }
@@ -55,7 +56,7 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
     {
         boolean advanced = family == ComputerFamily.ADVANCED;
         RenderSystem.setShaderTexture( 0, advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-        drawTexture( transform, x, y, 0, 0, TEX_WIDTH, TEX_HEIGHT );
+        drawTexture( transform, x + ComputerSidebar.WIDTH, y, 0, 0, TEX_WIDTH, TEX_HEIGHT );
 
         // Draw selection slot
         int slot = getScreenHandler().getSelectedSlot();
@@ -71,5 +72,6 @@ public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
         }
 
         RenderSystem.setShaderTexture( 0, advanced ? ComputerBorderRenderer.BACKGROUND_ADVANCED : ComputerBorderRenderer.BACKGROUND_NORMAL );
+        ComputerSidebar.renderBackground( transform, x, y + sidebarYOffset );
     }
 }
diff --git a/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java b/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java
new file mode 100644
index 000000000..b5090314d
--- /dev/null
+++ b/src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java
@@ -0,0 +1,107 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.client.gui.widgets;
+
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.client.render.ComputerBorderRenderer;
+import dan200.computercraft.shared.command.text.ChatHelpers;
+import dan200.computercraft.shared.computer.core.ClientComputer;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.Identifier;
+
+import java.util.Arrays;
+import java.util.function.Consumer;
+
+/**
+ * Registers buttons to interact with a computer.
+ */
+public final class ComputerSidebar
+{
+    private static final Identifier TEXTURE = new Identifier( ComputerCraft.MOD_ID, "textures/gui/buttons.png" );
+
+    private static final int TEX_SIZE = 64;
+
+    private static final int ICON_WIDTH = 12;
+    private static final int ICON_HEIGHT = 12;
+    private static final int ICON_MARGIN = 2;
+
+    private static final int ICON_TEX_Y_DIFF = 14;
+
+    private static final int CORNERS_BORDER = 3;
+    private static final int FULL_BORDER = CORNERS_BORDER + ICON_MARGIN;
+
+    private static final int BUTTONS = 2;
+    private static final int HEIGHT = (ICON_HEIGHT + ICON_MARGIN * 2) * BUTTONS + CORNERS_BORDER * 2;
+    public static final int WIDTH = 17;
+
+    private ComputerSidebar()
+    {
+    }
+
+    public static void addButtons(Screen screen, ClientComputer computer, Consumer<ClickableWidget> add, int x, int y )
+    {
+        x += CORNERS_BORDER + 1;
+        y += CORNERS_BORDER + ICON_MARGIN;
+
+        add.accept( new DynamicImageButton(
+            screen, x, y, ICON_WIDTH, ICON_HEIGHT, () -> computer.isOn() ? 15 : 1, 1, ICON_TEX_Y_DIFF,
+            TEXTURE, TEX_SIZE, TEX_SIZE, b -> toggleComputer( computer ),
+            () -> computer.isOn() ? Arrays.asList(
+                new TranslatableText( "gui.computercraft.tooltip.turn_off" ),
+                ChatHelpers.coloured(new TranslatableText( "gui.computercraft.tooltip.turn_off.key" ), Formatting.GRAY)
+            ) : Arrays.asList(
+                new TranslatableText( "gui.computercraft.tooltip.turn_on" ),
+                ChatHelpers.coloured(new TranslatableText( "gui.computercraft.tooltip.turn_off.key" ), Formatting.GRAY)
+            )
+        ) );
+
+        y += ICON_HEIGHT + ICON_MARGIN * 2;
+
+        add.accept( new DynamicImageButton(
+            screen, x, y, ICON_WIDTH, ICON_HEIGHT, 29, 1, ICON_TEX_Y_DIFF,
+            TEXTURE, TEX_SIZE, TEX_SIZE, b -> computer.queueEvent( "terminate" ),
+            Arrays.asList(
+                new TranslatableText( "gui.computercraft.tooltip.terminate" ),
+                ChatHelpers.coloured(new TranslatableText( "gui.computercraft.tooltip.terminate.key" ), Formatting.GRAY)
+            )
+        ) );
+    }
+
+    public static void renderBackground(MatrixStack transform, int x, int y )
+    {
+        Screen.drawTexture( transform,
+            x, y, 0, 102, WIDTH, FULL_BORDER,
+            ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
+        );
+
+        Screen.drawTexture( transform,
+            x, y + FULL_BORDER, WIDTH, HEIGHT - FULL_BORDER * 2,
+            0, 107, WIDTH, 4,
+            ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
+        );
+
+        Screen.drawTexture( transform,
+            x, y + HEIGHT - FULL_BORDER, 0, 111, WIDTH, FULL_BORDER,
+            ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
+        );
+    }
+
+    private static void toggleComputer( ClientComputer computer )
+    {
+        if( computer.isOn() )
+        {
+            computer.shutdown();
+        }
+        else
+        {
+            computer.turnOn();
+        }
+    }
+}
diff --git a/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java b/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java
new file mode 100644
index 000000000..a64431732
--- /dev/null
+++ b/src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java
@@ -0,0 +1,103 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.client.gui.widgets;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.tooltip.TooltipComponent;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.LiteralText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+import java.util.function.IntSupplier;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * Version of {@link net.minecraft.client.gui.widget.TexturedButtonWidget} which allows changing some properties
+ * dynamically.
+ */
+public class DynamicImageButton extends ButtonWidget
+{
+    private final Screen screen;
+    private final Identifier texture;
+    private final IntSupplier xTexStart;
+    private final int yTexStart;
+    private final int yDiffTex;
+    private final int textureWidth;
+    private final int textureHeight;
+    private final Supplier<List<Text>> tooltip;
+
+    public DynamicImageButton(
+        Screen screen, int x, int y, int width, int height, int xTexStart, int yTexStart, int yDiffTex,
+        Identifier texture, int textureWidth, int textureHeight,
+        PressAction onPress, List<Text> tooltip
+    )
+    {
+        this(
+            screen, x, y, width, height, () -> xTexStart, yTexStart, yDiffTex,
+            texture, textureWidth, textureHeight,
+            onPress, () -> tooltip
+        );
+    }
+
+
+    public DynamicImageButton(
+        Screen screen, int x, int y, int width, int height, IntSupplier xTexStart, int yTexStart, int yDiffTex,
+        Identifier texture, int textureWidth, int textureHeight,
+        PressAction onPress, Supplier<List<Text>> tooltip
+    )
+    {
+        super( x, y, width, height, LiteralText.EMPTY, onPress );
+        this.screen = screen;
+        this.textureWidth = textureWidth;
+        this.textureHeight = textureHeight;
+        this.xTexStart = xTexStart;
+        this.yTexStart = yTexStart;
+        this.yDiffTex = yDiffTex;
+        this.texture = texture;
+        this.tooltip = tooltip;
+    }
+
+    @Override
+    public void renderButton(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    {
+        RenderSystem.setShaderTexture( 0, texture );
+        RenderSystem.disableDepthTest();
+
+        int yTex = yTexStart;
+        if( isHovered() ) yTex += yDiffTex;
+
+        drawTexture( stack, x, y, xTexStart.getAsInt(), yTex, width, height, textureWidth, textureHeight );
+        RenderSystem.enableDepthTest();
+
+        if( isHovered() ) renderToolTip( stack, mouseX, mouseY );
+    }
+
+    @Nonnull
+    @Override
+    public Text getMessage()
+    {
+        List<Text> tooltip = this.tooltip.get();
+        return tooltip.isEmpty() ? LiteralText.EMPTY : tooltip.get( 0 );
+    }
+
+//    @Override
+    public void renderToolTip( @Nonnull MatrixStack stack, int mouseX, int mouseY )
+    {
+        List<Text> tooltip = this.tooltip.get();
+
+        if( !tooltip.isEmpty() )
+        {
+            screen.renderTooltip( stack, tooltip, mouseX, mouseY );
+        }
+    }
+}
diff --git a/src/main/java/dan200/computercraft/client/gui/widgets/WidgetWrapper.java b/src/main/java/dan200/computercraft/client/gui/widgets/WidgetWrapper.java
deleted file mode 100644
index c805a16ce..000000000
--- a/src/main/java/dan200/computercraft/client/gui/widgets/WidgetWrapper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-
-package dan200.computercraft.client.gui.widgets;
-
-import net.minecraft.client.gui.Element;
-
-public class WidgetWrapper implements Element
-{
-    private final Element listener;
-    private final int x;
-    private final int y;
-    private final int width;
-    private final int height;
-
-    public WidgetWrapper( Element listener, int x, int y, int width, int height )
-    {
-        this.listener = listener;
-        this.x = x;
-        this.y = y;
-        this.width = width;
-        this.height = height;
-    }
-
-    @Override
-    public boolean mouseClicked( double x, double y, int button )
-    {
-        double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseClicked( dx, dy, button );
-    }
-
-    @Override
-    public boolean mouseReleased( double x, double y, int button )
-    {
-        double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseReleased( dx, dy, button );
-    }
-
-    @Override
-    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
-    {
-        double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseDragged( dx, dy, button, deltaX, deltaY );
-    }
-
-    @Override
-    public boolean mouseScrolled( double x, double y, double delta )
-    {
-        double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseScrolled( dx, dy, delta );
-    }
-
-    @Override
-    public boolean keyPressed( int key, int scancode, int modifiers )
-    {
-        return listener.keyPressed( key, scancode, modifiers );
-    }
-
-    @Override
-    public boolean keyReleased( int key, int scancode, int modifiers )
-    {
-        return listener.keyReleased( key, scancode, modifiers );
-    }
-
-    @Override
-    public boolean charTyped( char character, int modifiers )
-    {
-        return listener.charTyped( character, modifiers );
-    }
-
-    @Override
-    public boolean changeFocus( boolean b )
-    {
-        return listener.changeFocus( b );
-    }
-
-    @Override
-    public boolean isMouseOver( double x, double y )
-    {
-        double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < width && dy >= 0 && dy < height;
-    }
-
-    public int getX()
-    {
-        return x;
-    }
-
-    public int getY()
-    {
-        return y;
-    }
-
-    public int getWidth()
-    {
-        return width;
-    }
-
-    public int getHeight()
-    {
-        return height;
-    }
-}
diff --git a/src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java b/src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java
index 332c4355f..ec2d1149a 100644
--- a/src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java
@@ -39,7 +39,8 @@ public class ComputerBorderRenderer
     private static final int LIGHT_CORNER_Y = 80;
 
     public static final int LIGHT_HEIGHT = 8;
-    private static final float TEX_SCALE = 1 / 256.0f;
+    public static final int TEX_SIZE = 256;
+    private static final float TEX_SCALE = 1 / (float) TEX_SIZE;
 
     static
     {
diff --git a/src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java b/src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java
index 63d0c3b33..5c3383929 100644
--- a/src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java
+++ b/src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java
@@ -32,7 +32,6 @@ public class MixinWorld
     @Inject( method = "addBlockEntity", at = @At( "HEAD" ) )
     public void addBlockEntity( @Nullable BlockEntity entity, CallbackInfo info )
     {
-        System.out.println("addBlockEntity");
         if( entity != null && !entity.isRemoved() && entity.getWorld().isInBuildLimit(entity.getPos()) && iteratingTickingBlockEntities )
         {
             setWorld( entity, this );
@@ -41,7 +40,6 @@ public class MixinWorld
 
     private static void setWorld( BlockEntity entity, Object world )
     {
-        System.out.println("setWorld");
         if( entity.getWorld() != world && entity instanceof TileGeneric )
         {
             entity.setWorld( (World) world ); //TODO why?
diff --git a/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java b/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java
index 2d35669dd..96e79af68 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java
@@ -6,6 +6,7 @@
 
 package dan200.computercraft.shared.turtle.inventory;
 
+import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.IComputer;
@@ -36,7 +37,8 @@ public class ContainerTurtle extends ContainerComputerBase
 {
     public static final int BORDER = 8;
     public static final int PLAYER_START_Y = 134;
-    public static final int TURTLE_START_X = 175;
+    public static final int TURTLE_START_X = ComputerSidebar.WIDTH + 175;
+    public static final int PLAYER_START_X = ComputerSidebar.WIDTH + BORDER;
 
     private final PropertyDelegate properties;
 
@@ -75,14 +77,14 @@ public class ContainerTurtle extends ContainerComputerBase
         {
             for( int x = 0; x < 9; x++ )
             {
-                addSlot( new Slot( playerInventory, x + y * 9 + 9, 8 + x * 18, PLAYER_START_Y + 1 + y * 18 ) );
+                addSlot( new Slot( playerInventory, x + y * 9 + 9, PLAYER_START_X + x * 18, PLAYER_START_Y + 1 + y * 18 ) );
             }
         }
 
         // Player hotbar
         for( int x = 0; x < 9; x++ )
         {
-            addSlot( new Slot( playerInventory, x, 8 + x * 18, PLAYER_START_Y + 3 * 18 + 5 ) );
+            addSlot( new Slot( playerInventory, x, PLAYER_START_X + x * 18, PLAYER_START_Y + 3 * 18 + 5 ) );
         }
     }
 
diff --git a/src/main/resources/assets/computercraft/lang/de_de.json b/src/main/resources/assets/computercraft/lang/de_de.json
index b9ea46bed..ab3205ce0 100644
--- a/src/main/resources/assets/computercraft/lang/de_de.json
+++ b/src/main/resources/assets/computercraft/lang/de_de.json
@@ -34,14 +34,15 @@
     "upgrade.minecraft.diamond_axe.adjective": "Holzfällen",
     "upgrade.minecraft.diamond_hoe.adjective": "Ackerbau",
     "upgrade.minecraft.crafting_table.adjective": "Handwerk",
-    "upgrade.computercraft.wireless_modem_normal.adjective": "Ender",
-    "upgrade.computercraft.wireless_modem_advanced.adjective": "Kabellos",
+    "upgrade.computercraft.wireless_modem_normal.adjective": "Kabellos",
+    "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender",
     "upgrade.computercraft.speaker.adjective": "Laut",
     "chat.computercraft.wired_modem.peripheral_connected": "Peripheriegerät \"%s\" mit dem Netzwerk verbunden",
     "chat.computercraft.wired_modem.peripheral_disconnected": "Peripheriegerät \"%s\" vom Netzwerk getrennt",
     "commands.computercraft.synopsis": "Verschiedene Befehle um Computer zu kontrollieren.",
     "commands.computercraft.desc": "Der /computercraft Befehl enthält verschiedene Werkzeuge um Computer zu debuggen, kontrollieren oder mit ihnen zu interagieren.",
     "commands.computercraft.help.synopsis": "Zeigt die Hilfe für den angegebenen Befehl",
+    "commands.computercraft.help.desc": "Zeigt diese Hilfe",
     "commands.computercraft.help.no_children": "%s hat keine Unterbefehle",
     "commands.computercraft.help.no_command": "Unbekannter Befehl '%s'",
     "commands.computercraft.dump.synopsis": "Zeigt den Status eines Computers.",
@@ -89,6 +90,7 @@
     "argument.computercraft.computer.no_matching": "Kein Computer passt auf '%s'",
     "argument.computercraft.computer.many_matching": "Mehrere Computer passen auf '%s' (Instanzen %s)",
     "argument.computercraft.tracking_field.no_field": "Unbekanntes Feld '%s'",
+    "argument.computercraft.argument_expected": "Parameter erwartet",
     "tracking_field.computercraft.tasks.name": "Aufgaben",
     "tracking_field.computercraft.total.name": "Gesamtzeit",
     "tracking_field.computercraft.average.name": "Durchschnittliche Zeit",
@@ -107,7 +109,5 @@
     "tracking_field.computercraft.coroutines_dead.name": "Koroutinen gelöscht",
     "gui.computercraft.tooltip.copy": "In die Zwischenablage kopieren",
     "gui.computercraft.tooltip.computer_id": "Computer ID: %s",
-    "gui.computercraft.tooltip.disk_id": "Disketten ID: %s",
-    "argument.computercraft.argument_expected": "Parameter erwartet",
-    "commands.computercraft.help.desc": "Zeigt diese Hilfe"
+    "gui.computercraft.tooltip.disk_id": "Disketten ID: %s"
 }
diff --git a/src/main/resources/assets/computercraft/lang/en_us.json b/src/main/resources/assets/computercraft/lang/en_us.json
index f64be4083..e19fd33e6 100644
--- a/src/main/resources/assets/computercraft/lang/en_us.json
+++ b/src/main/resources/assets/computercraft/lang/en_us.json
@@ -1,5 +1,5 @@
 {
-    "itemGroup.computercraft.main": "ComputerCraft",
+    "itemGroup.computercraft": "ComputerCraft",
     "block.computercraft.computer_normal": "Computer",
     "block.computercraft.computer_advanced": "Advanced Computer",
     "block.computercraft.computer_command": "Command Computer",
@@ -31,7 +31,6 @@
     "upgrade.minecraft.diamond_sword.adjective": "Melee",
     "upgrade.minecraft.diamond_shovel.adjective": "Digging",
     "upgrade.minecraft.diamond_pickaxe.adjective": "Mining",
-	"upgrade.minecraft.netherite_pickaxe.adjective": "Netherite Mining",
     "upgrade.minecraft.diamond_axe.adjective": "Felling",
     "upgrade.minecraft.diamond_hoe.adjective": "Farming",
     "upgrade.minecraft.crafting_table.adjective": "Crafty",
@@ -111,5 +110,26 @@
     "tracking_field.computercraft.coroutines_dead.name": "Coroutines disposed",
     "gui.computercraft.tooltip.copy": "Copy to clipboard",
     "gui.computercraft.tooltip.computer_id": "Computer ID: %s",
-    "gui.computercraft.tooltip.disk_id": "Disk ID: %s"
+    "gui.computercraft.tooltip.disk_id": "Disk ID: %s",
+    "gui.computercraft.tooltip.turn_on": "Turn this computer on",
+    "gui.computercraft.tooltip.turn_on.key": "Hold Ctrl+R",
+    "gui.computercraft.tooltip.turn_off": "Turn this computer off",
+    "gui.computercraft.tooltip.turn_off.key": "Hold Ctrl+S",
+    "gui.computercraft.tooltip.terminate": "Stop the currently running code",
+    "gui.computercraft.tooltip.terminate.key": "Hold Ctrl+T",
+    "gui.computercraft.upload.success": "Upload Succeeded",
+    "gui.computercraft.upload.success.msg": "%d files uploaded.",
+    "gui.computercraft.upload.failed": "Upload Failed",
+    "gui.computercraft.upload.failed.out_of_space": "Not enough space on the computer for these files.",
+    "gui.computercraft.upload.failed.computer_off": "You must turn the computer on before uploading files.",
+    "gui.computercraft.upload.failed.too_much": "Your files are too large to be uploaded.",
+    "gui.computercraft.upload.failed.name_too_long": "File names are too long to be uploaded.",
+    "gui.computercraft.upload.failed.too_many_files": "Cannot upload this many files.",
+    "gui.computercraft.upload.failed.overwrite_dir": "Cannot upload %s, as there is already a directory with the same name.",
+    "gui.computercraft.upload.failed.generic": "Uploading files failed (%s)",
+    "gui.computercraft.upload.failed.corrupted": "Files corrupted when uploading. Please try again.",
+    "gui.computercraft.upload.overwrite": "Files would be overwritten",
+    "gui.computercraft.upload.overwrite.detail": "The following files will be overwritten when uploading. Continue?%s",
+    "gui.computercraft.upload.overwrite_button": "Overwrite",
+    "gui.computercraft.pocket_computer_overlay": "Pocket computer open. Press ESC to close."
 }
diff --git a/src/main/resources/assets/computercraft/lang/fr_fr.json b/src/main/resources/assets/computercraft/lang/fr_fr.json
index b97fa5b4c..dd907ec71 100644
--- a/src/main/resources/assets/computercraft/lang/fr_fr.json
+++ b/src/main/resources/assets/computercraft/lang/fr_fr.json
@@ -1,4 +1,5 @@
 {
+    "itemGroup.computercraft": "ComputerCraft",
     "block.computercraft.computer_normal": "Ordinateur",
     "block.computercraft.computer_advanced": "Ordinateur avancé",
     "block.computercraft.computer_command": "Ordinateur de commande",
@@ -17,7 +18,7 @@
     "block.computercraft.turtle_normal.upgraded_twice": "Tortue %s et %s",
     "block.computercraft.turtle_advanced": "Tortue avancée",
     "block.computercraft.turtle_advanced.upgraded": "Tortue %s avancée",
-    "block.computercraft.turtle_advanced.upgraded_twice": "Tortue %s %s avancée",
+    "block.computercraft.turtle_advanced.upgraded_twice": "Tortue %s et %s avancée",
     "item.computercraft.disk": "Disquette",
     "item.computercraft.treasure_disk": "Disquette",
     "item.computercraft.printed_page": "Page imprimée",
@@ -26,56 +27,65 @@
     "item.computercraft.pocket_computer_normal": "Ordinateur de poche",
     "item.computercraft.pocket_computer_normal.upgraded": "Ordinateur de poche %s",
     "item.computercraft.pocket_computer_advanced": "Ordinateur de poche avancé",
-    "item.computercraft.pocket_computer_advanced.upgraded": "Ordinateur de poche %s avancé",
-    "upgrade.minecraft.diamond_sword.adjective": "combattante",
-    "upgrade.minecraft.diamond_shovel.adjective": "excavatrice",
-    "upgrade.minecraft.diamond_pickaxe.adjective": "minière",
-    "upgrade.minecraft.diamond_axe.adjective": "forestière",
-    "upgrade.minecraft.diamond_hoe.adjective": "agricole",
-    "upgrade.minecraft.crafting_table.adjective": "ouvrière",
-    "upgrade.computercraft.wireless_modem_normal.adjective": "sans fil",
+    "item.computercraft.pocket_computer_advanced.upgraded": "Ordinateur de poche avancé %s",
+    "upgrade.minecraft.diamond_sword.adjective": "De Combat",
+    "upgrade.minecraft.diamond_shovel.adjective": "Excavatrice",
+    "upgrade.minecraft.diamond_pickaxe.adjective": "Mineuse",
+    "upgrade.minecraft.diamond_axe.adjective": "Bûcheronne",
+    "upgrade.minecraft.diamond_hoe.adjective": "Fermière",
+    "upgrade.minecraft.crafting_table.adjective": "Ouvrière",
+    "upgrade.computercraft.wireless_modem_normal.adjective": "Sans Fil",
     "upgrade.computercraft.wireless_modem_advanced.adjective": "de l'End",
     "upgrade.computercraft.speaker.adjective": "Bruyante",
     "chat.computercraft.wired_modem.peripheral_connected": "Le périphérique \"%s\" est connecté au réseau",
     "chat.computercraft.wired_modem.peripheral_disconnected": "Le périphérique \"%s\" est déconnecté du réseau",
+    "commands.computercraft.synopsis": "Commandes diverses pour contrôler les ordinateurs.",
+    "commands.computercraft.desc": "La commande /computercraft fournit des outils d'administration et de débogage variés pour contrôler et interagir avec les ordinateurs.",
+    "commands.computercraft.help.synopsis": "Fournit de l'aide pour une commande spécifique",
     "commands.computercraft.help.desc": "Affiche ce message d'aide",
-    "itemGroup.computercraft": "ComputerCraft",
     "commands.computercraft.help.no_children": "%s n'a pas de sous-commandes",
+    "commands.computercraft.help.no_command": "La commande '%s' n'existe pas",
     "commands.computercraft.dump.synopsis": "Affiche le statut des ordinateurs.",
+    "commands.computercraft.dump.desc": "Affiche les statuts de tous les ordinateurs, ou des information spécifiques sur un ordinateur. Vous pouvez spécifier l'identifiant d'instance (ex. 123), l'identifiant d'ordinateur (ex. #123) ou son nom (ex. \"@Mon Ordinateur\").",
     "commands.computercraft.dump.action": "Voir plus d'informations à propos de cet ordinateur",
     "commands.computercraft.shutdown.synopsis": "Éteindre des ordinateurs à distance.",
     "commands.computercraft.shutdown.desc": "Éteint les ordinateurs dans la liste ou tous, si aucun n'est spécifié dans cette liste. Vous pouvez spécifier l'identifiant d'instance (ex. 123), l'identifiant d'ordinateur (ex. #123) ou son nom (ex. \"@Mon Ordinateur\").",
+    "commands.computercraft.shutdown.done": "%s/%s ordinateurs arrêté",
     "commands.computercraft.turn_on.synopsis": "Démarre des ordinateurs à distance.",
+    "commands.computercraft.turn_on.desc": "Démarre les ordinateurs dans la liste. Vous pouvez spécifier l'identifiant d'instance (ex. 123), l'identifiant d'ordinateur (ex. #123) ou son nom (ex. \"@Mon Ordinateur\").",
     "commands.computercraft.turn_on.done": "%s/%s ordinateurs ont été allumés",
     "commands.computercraft.tp.synopsis": "Se téléporter à la position de l'ordinateur spécifié.",
     "commands.computercraft.tp.desc": "Se téléporter à la position de l'ordinateur. Vous pouvez spécifier l'identifiant d'instance (ex. 123) ou l'identifiant d'ordinateur (ex. #123).",
     "commands.computercraft.tp.action": "Se téléporter vers cet ordinateur",
     "commands.computercraft.tp.not_player": "Impossible d'ouvrir un terminal pour un non-joueur",
     "commands.computercraft.tp.not_there": "Impossible de localiser cet ordinateur dans le monde",
+    "commands.computercraft.view.synopsis": "Visualiser le terminal de cet ordinateur.",
+    "commands.computercraft.view.desc": "Ouvre le terminal d'un ordinateur, autorisant le contrôle à distance. Ceci ne permet pas d'accéder à l'inventaire des tortues. Vous pouvez spécifier l'identifiant d'instance (ex. 123) ou l'identifiant d'ordinateur (ex. #123).",
     "commands.computercraft.view.action": "Visualiser cet ordinateur",
     "commands.computercraft.view.not_player": "Impossible d'ouvrir un terminal pour un non-joueur",
     "commands.computercraft.track.synopsis": "Surveille les temps d'exécution des ordinateurs.",
     "commands.computercraft.track.desc": "Surveillez combien de temps prend une exécutions sur les ordinateurs, ainsi que le nombre d’événements capturés. Les informations sont affichées d'une manière similaire à la commande /forge track, utile pour diagnostiquer les sources de latence.",
     "commands.computercraft.track.start.synopsis": "Démarrer la surveillance de tous les ordinateurs",
+    "commands.computercraft.track.start.desc": "Démarre la surveillance de tous les temps d'exécution et du nombre d'événements gérés. Ceci effacera les résultats de la dernière exécution.",
     "commands.computercraft.track.start.stop": "Exécutez %s pour arrêter la surveillance et visualiser les résultats",
     "commands.computercraft.track.stop.synopsis": "Arrêter la surveillance de tous les ordinateurs",
     "commands.computercraft.track.stop.desc": "Arrêter la surveillance des événements et des temps d'exécution",
     "commands.computercraft.track.stop.action": "Cliquez pour arrêter la surveillance",
-    "commands.computercraft.help.no_command": "Commande '%s' non reconnue",
-    "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.exception": "Exception non gérée (%s)",
-    "gui.computercraft.tooltip.disk_id": "ID de disque : %s",
     "commands.computercraft.track.stop.not_enabled": "Surveillance actuellement désactivée",
     "commands.computercraft.track.dump.synopsis": "Effacer les dernières informations de surveillance",
     "commands.computercraft.track.dump.desc": "Efface les derniers résultats de surveillance des ordinateurs.",
+    "commands.computercraft.track.dump.no_timings": "Temps non disponibles",
     "commands.computercraft.track.dump.computer": "Ordinateur",
     "commands.computercraft.reload.synopsis": "Actualiser le fichier de configuration de ComputerCraft",
     "commands.computercraft.reload.desc": "Actualise le fichier de configuration de ComputerCraft",
     "commands.computercraft.reload.done": "Configuration actualisée",
     "commands.computercraft.queue.synopsis": "Envoyer un événement computer_command à un ordinateur de commande",
+    "commands.computercraft.queue.desc": "Envoie un événement computer_command à un ordinateur de commande, en passant les éventuels arguments additionnels. Ceci est principalement conçu pour les map makers, imitant la commande /trigger, pour une utilisation avec les ordinateurs. N'importe quel joueur peut exécuter cette commande, qui sera exécutée le plus souvent avec un événement de clic sur du texte.",
     "commands.computercraft.generic.no_position": "<pas de position>",
     "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "O",
+    "commands.computercraft.generic.no": "N",
+    "commands.computercraft.generic.exception": "Exception non gérée (%s)",
     "commands.computercraft.generic.additional_rows": "%d lignes supplémentaires…",
     "argument.computercraft.computer.no_matching": "Pas d'ordinateurs correspondant à '%s'",
     "argument.computercraft.computer.many_matching": "Plusieurs ordinateurs correspondent à '%s' (instances %s)",
@@ -91,23 +101,13 @@
     "tracking_field.computercraft.fs.name": "Opérations sur le système de fichiers",
     "tracking_field.computercraft.turtle.name": "Opérations sur les tortues",
     "tracking_field.computercraft.http.name": "Requêtes HTTP",
+    "tracking_field.computercraft.http_upload.name": "Publication HTTP",
+    "tracking_field.computercraft.http_download.name": "Téléchargement HTTP",
     "tracking_field.computercraft.websocket_incoming.name": "Websocket entrant",
     "tracking_field.computercraft.websocket_outgoing.name": "Websocket sortant",
     "tracking_field.computercraft.coroutines_created.name": "Coroutines créées",
     "tracking_field.computercraft.coroutines_dead.name": "Coroutines mortes",
     "gui.computercraft.tooltip.copy": "Copier dans le Presse-Papiers",
     "gui.computercraft.tooltip.computer_id": "ID d'ordinateur : %s",
-    "commands.computercraft.track.dump.no_timings": "Temps non disponibles",
-    "tracking_field.computercraft.http_upload.name": "Publication HTTP",
-    "commands.computercraft.desc": "La commande /computercraft fournit des outils d'administration et de débogage variés pour contrôler et interagir avec les ordinateurs.",
-    "commands.computercraft.dump.desc": "Affiche les statuts de tous les ordinateurs, ou des information spécifiques sur un ordinateur. Vous pouvez spécifier l'identifiant d'instance (ex. 123), l'identifiant d'ordinateur (ex. #123) ou son nom (ex. \"@Mon Ordinateur\").",
-    "commands.computercraft.turn_on.desc": "Démarre les ordinateurs dans la liste. Vous pouvez spécifier l'identifiant d'instance (ex. 123), l'identifiant d'ordinateur (ex. #123) ou son nom (ex. \"@Mon Ordinateur\").",
-    "commands.computercraft.view.synopsis": "Visualiser le terminal de cet ordinateur.",
-    "commands.computercraft.view.desc": "Ouvre le terminal d'un ordinateur, autorisant le contrôle à distance. Ceci ne permet pas d'accéder à l'inventaire des tortues. Vous pouvez spécifier l'identifiant d'instance (ex. 123) ou l'identifiant d'ordinateur (ex. #123).",
-    "commands.computercraft.track.start.desc": "Démarre la surveillance de tous les temps d'exécution et du nombre d'événements gérés. Ceci effacera les résultats de la dernière exécution.",
-    "commands.computercraft.queue.desc": "Envoie un événement computer_command à un ordinateur de commande, en passant les éventuels arguments additionnels. Ceci est principalement conçu pour les map makers, imitant la commande /trigger, pour une utilisation avec les ordinateurs. N'importe quel joueur peut exécuter cette commande, qui sera exécutée le plus souvent avec un événement de clic sur du texte.",
-    "commands.computercraft.help.synopsis": "Fournit de l'aide pour une commande spécifique",
-    "tracking_field.computercraft.http_download.name": "Téléchargement HTTP",
-    "commands.computercraft.synopsis": "Commandes diverses pour contrôler les ordinateurs.",
-    "commands.computercraft.shutdown.done": "%s/%s ordinateurs arrêté"
+    "gui.computercraft.tooltip.disk_id": "ID de disque : %s"
 }
diff --git a/src/main/resources/assets/computercraft/lang/it_it.json b/src/main/resources/assets/computercraft/lang/it_it.json
index 765604081..71daaddcf 100644
--- a/src/main/resources/assets/computercraft/lang/it_it.json
+++ b/src/main/resources/assets/computercraft/lang/it_it.json
@@ -85,29 +85,29 @@
     "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "S",
     "commands.computercraft.generic.no": "N",
+    "commands.computercraft.generic.exception": "Eccezione non gestita (%s)",
     "commands.computercraft.generic.additional_rows": "%d colonne aggiuntive…",
     "argument.computercraft.computer.no_matching": "Nessun computer che combacia con '%s'",
+    "argument.computercraft.computer.many_matching": "Molteplici computer che combaciano con '%s' (istanze %s)",
+    "argument.computercraft.tracking_field.no_field": "Campo sconosciuto '%s'",
+    "argument.computercraft.argument_expected": "È previsto un argomento",
+    "tracking_field.computercraft.tasks.name": "Compiti",
+    "tracking_field.computercraft.total.name": "Tempo totale",
     "tracking_field.computercraft.average.name": "Tempo medio",
     "tracking_field.computercraft.max.name": "Tempo massimo",
+    "tracking_field.computercraft.server_count.name": "Numero di compiti del server",
+    "tracking_field.computercraft.server_time.name": "Tempo di compito del server",
     "tracking_field.computercraft.peripheral.name": "Chiamate alle periferiche",
     "tracking_field.computercraft.fs.name": "Operazioni filesystem",
     "tracking_field.computercraft.turtle.name": "Operazioni tartarughe",
     "tracking_field.computercraft.http.name": "Richieste HTTP",
     "tracking_field.computercraft.http_upload.name": "Upload HTTP",
     "tracking_field.computercraft.http_download.name": "Download HTTP",
-    "tracking_field.computercraft.coroutines_created.name": "Coroutine create",
-    "gui.computercraft.tooltip.copy": "Copia negli appunti",
-    "gui.computercraft.tooltip.computer_id": "ID Computer: %s",
-    "gui.computercraft.tooltip.disk_id": "ID Disco: %s",
-    "commands.computercraft.generic.exception": "Eccezione non gestita (%s)",
-    "argument.computercraft.computer.many_matching": "Molteplici computer che combaciano con '%s' (istanze %s)",
-    "argument.computercraft.tracking_field.no_field": "Campo sconosciuto '%s'",
-    "argument.computercraft.argument_expected": "È previsto un argomento",
-    "tracking_field.computercraft.tasks.name": "Compiti",
-    "tracking_field.computercraft.total.name": "Tempo totale",
-    "tracking_field.computercraft.server_count.name": "Numero di compiti del server",
-    "tracking_field.computercraft.server_time.name": "Tempo di compito del server",
     "tracking_field.computercraft.websocket_incoming.name": "Websocket in arrivo",
     "tracking_field.computercraft.websocket_outgoing.name": "Websocket in uscita",
-    "tracking_field.computercraft.coroutines_dead.name": "Coroutine cancellate"
+    "tracking_field.computercraft.coroutines_created.name": "Coroutine create",
+    "tracking_field.computercraft.coroutines_dead.name": "Coroutine cancellate",
+    "gui.computercraft.tooltip.copy": "Copia negli appunti",
+    "gui.computercraft.tooltip.computer_id": "ID Computer: %s",
+    "gui.computercraft.tooltip.disk_id": "ID Disco: %s"
 }
diff --git a/src/main/resources/assets/computercraft/lang/ja_jp.json b/src/main/resources/assets/computercraft/lang/ja_jp.json
new file mode 100644
index 000000000..c006855ed
--- /dev/null
+++ b/src/main/resources/assets/computercraft/lang/ja_jp.json
@@ -0,0 +1,131 @@
+{
+    "itemGroup.computercraft": "ComputerCraft",
+    "block.computercraft.computer_normal": "コンピューター",
+    "block.computercraft.computer_advanced": "高度なコンピューター",
+    "block.computercraft.computer_command": "コマンドコンピューター",
+    "block.computercraft.disk_drive": "ディスクドライブ",
+    "block.computercraft.printer": "プリンター",
+    "block.computercraft.speaker": "スピーカー",
+    "block.computercraft.monitor_normal": "モニター",
+    "block.computercraft.monitor_advanced": "高度なモニター",
+    "block.computercraft.wireless_modem_advanced": "エンダーモデム",
+    "block.computercraft.wired_modem": "有線モデム",
+    "block.computercraft.cable": "ネットワークケーブル",
+    "block.computercraft.wired_modem_full": "有線モデム",
+    "block.computercraft.turtle_normal": "タートル",
+    "block.computercraft.turtle_normal.upgraded": "%sタートル",
+    "block.computercraft.turtle_normal.upgraded_twice": "%s%sタートル",
+    "block.computercraft.turtle_advanced": "高度なタートル",
+    "block.computercraft.turtle_advanced.upgraded": "高度な%sタートル",
+    "item.computercraft.disk": "フロッピーディスク",
+    "item.computercraft.treasure_disk": "フロッピーディスク",
+    "item.computercraft.printed_page": "印刷された紙",
+    "item.computercraft.printed_pages": "印刷された紙束",
+    "item.computercraft.printed_book": "印刷された本",
+    "item.computercraft.pocket_computer_normal": "ポケットコンピュータ",
+    "item.computercraft.pocket_computer_normal.upgraded": "%sポケットコンピュータ",
+    "item.computercraft.pocket_computer_advanced.upgraded": "高度な%sポケットコンピュータ",
+    "upgrade.minecraft.diamond_shovel.adjective": "掘削",
+    "upgrade.minecraft.diamond_pickaxe.adjective": "採掘",
+    "upgrade.minecraft.diamond_axe.adjective": "伐採",
+    "upgrade.minecraft.diamond_hoe.adjective": "農耕",
+    "upgrade.minecraft.crafting_table.adjective": "クラフト",
+    "upgrade.computercraft.wireless_modem_advanced.adjective": "エンダー",
+    "upgrade.computercraft.speaker.adjective": "騒音",
+    "chat.computercraft.wired_modem.peripheral_connected": "周辺の\"%s\"のネットワークに接続されました",
+    "commands.computercraft.synopsis": "コンピュータを制御するためのさまざまなコマンド。",
+    "commands.computercraft.help.synopsis": "特定のコマンドのヘルプを提供します",
+    "commands.computercraft.help.desc": "このヘルプメッセージを表示します",
+    "commands.computercraft.help.no_children": "%s にサブコマンドはありません",
+    "commands.computercraft.help.no_command": "%s というコマンドはありません",
+    "commands.computercraft.dump.synopsis": "コンピュータの状態を表示します。",
+    "commands.computercraft.dump.action": "このコンピュータの詳細を表示します",
+    "commands.computercraft.dump.open_path": "このコンピュータのファイルを表示します",
+    "commands.computercraft.shutdown.synopsis": "コンピュータをリモートでシャットダウンする。",
+    "commands.computercraft.shutdown.done": "%s/%s コンピューターをシャットダウンしました",
+    "commands.computercraft.turn_on.desc": "指定されているコンピュータを起動します。 コンピュータのインスタンスID (例えば 123), コンピュータID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
+    "commands.computercraft.turn_on.done": "%s/%s コンピューターを起動しました",
+    "commands.computercraft.tp.synopsis": "特定のコンピュータにテレポート。",
+    "commands.computercraft.tp.action": "このコンピューターへテレポートします",
+    "commands.computercraft.tp.not_player": "非プレイヤー用のターミナルを開くことができません",
+    "commands.computercraft.tp.not_there": "世界でコンピュータを見つけることができませんでした",
+    "commands.computercraft.view.synopsis": "コンピュータのターミナルを表示します。",
+    "commands.computercraft.turn_on.synopsis": "コンピューターをリモートで起動します。",
+    "commands.computercraft.view.action": "このコンピュータを見ます",
+    "commands.computercraft.view.not_player": "非プレイヤー用のターミナルを開くことができません",
+    "commands.computercraft.track.synopsis": "コンピュータの実行時間を追跡します。",
+    "commands.computercraft.track.start.synopsis": "すべてのコンピュータの追跡を開始します",
+    "commands.computercraft.track.start.desc": "すべてのコンピュータの実行時間とイベント数の追跡を開始します。 これにより、以前の実行結果が破棄されます。",
+    "commands.computercraft.track.stop.synopsis": "すべてのコンピュータの追跡を停止します",
+    "commands.computercraft.track.stop.action": "追跡を中止するためにクリックしてください",
+    "commands.computercraft.track.stop.not_enabled": "現在コンピュータを追跡していません",
+    "commands.computercraft.track.dump.synopsis": "最新の追跡結果をダンプしてください",
+    "commands.computercraft.track.dump.desc": "コンピュータの最新の追跡結果をダンプしてください。",
+    "commands.computercraft.track.dump.no_timings": "利用可能なタイミングはありません",
+    "commands.computercraft.reload.synopsis": "コンピュータークラフトのコンフィグファイルを再読み込みします",
+    "commands.computercraft.reload.done": "コンフィグを再読み込みしました",
+    "commands.computercraft.queue.synopsis": "computer_command インベントをコマンドコンピューターに送信します",
+    "commands.computercraft.generic.no_position": "<no pos>",
+    "commands.computercraft.generic.position": "%s, %s, %s",
+    "commands.computercraft.generic.yes": "Y",
+    "commands.computercraft.generic.no": "N",
+    "commands.computercraft.track.start.stop": "トラッキングを停止して結果を表示するには %s を実行してください",
+    "commands.computercraft.generic.exception": "未処理の例外 (%s)",
+    "commands.computercraft.generic.additional_rows": "%d行を追加…",
+    "argument.computercraft.computer.no_matching": "'%s'に一致するコンピュータはありません",
+    "argument.computercraft.computer.many_matching": "'%s'に一致する複数のコンピューター (インスタンス %s)",
+    "argument.computercraft.tracking_field.no_field": "'%s'は未知のフィールドです",
+    "argument.computercraft.argument_expected": "引数が期待される",
+    "tracking_field.computercraft.tasks.name": "タスク",
+    "tracking_field.computercraft.total.name": "合計時間",
+    "tracking_field.computercraft.average.name": "平均時間",
+    "tracking_field.computercraft.max.name": "最大時間",
+    "tracking_field.computercraft.server_count.name": "サーバータスク数",
+    "tracking_field.computercraft.server_time.name": "サーバータスク時間",
+    "tracking_field.computercraft.fs.name": "ファイルシステム演算",
+    "tracking_field.computercraft.turtle.name": "タートル演算",
+    "tracking_field.computercraft.http.name": "HTTPリクエスト",
+    "tracking_field.computercraft.http_upload.name": "HTTPアップロード",
+    "tracking_field.computercraft.http_download.name": "HTTPダウンロード",
+    "tracking_field.computercraft.websocket_incoming.name": "Websocket 受信",
+    "tracking_field.computercraft.websocket_outgoing.name": "Websocket 送信",
+    "tracking_field.computercraft.coroutines_dead.name": "コルーチン削除",
+    "gui.computercraft.tooltip.copy": "クリップボードにコピー",
+    "gui.computercraft.tooltip.computer_id": "コンピュータID: %s",
+    "gui.computercraft.tooltip.disk_id": "ディスクID: %s",
+    "gui.computercraft.tooltip.turn_on": "このコンピュータをオンにする",
+    "gui.computercraft.tooltip.turn_on.key": "Ctrl+R 長押し",
+    "gui.computercraft.tooltip.turn_off.key": "Ctrl+S 長押し",
+    "gui.computercraft.tooltip.terminate": "現在実行中のコードを停止する",
+    "gui.computercraft.tooltip.terminate.key": "Ctrl+T 長押し",
+    "gui.computercraft.upload.success": "アップロードは成功しました",
+    "gui.computercraft.upload.failed": "アップロードに失敗しました",
+    "gui.computercraft.upload.failed.out_of_space": "これらのファイルに必要なスペースがコンピュータ上にありません。",
+    "gui.computercraft.upload.failed.too_much": "アップロードするにはファイルが大きスギます。",
+    "gui.computercraft.upload.failed.overwrite_dir": "同じ名前のディレクトリがすでにあるため、%s をアップロードできません。",
+    "gui.computercraft.upload.failed.generic": "ファイルのアップロードに失敗しました(%s)",
+    "gui.computercraft.upload.overwrite": "ファイルは上書きされます",
+    "gui.computercraft.upload.overwrite_button": "上書き",
+    "block.computercraft.wireless_modem_normal": "無線モデム",
+    "block.computercraft.turtle_advanced.upgraded_twice": "高度な%s%sタートル",
+    "item.computercraft.pocket_computer_advanced": "高度なポケットコンピュータ",
+    "upgrade.minecraft.diamond_sword.adjective": "攻撃",
+    "upgrade.computercraft.wireless_modem_normal.adjective": "無線",
+    "chat.computercraft.wired_modem.peripheral_disconnected": "周辺の\"%s\"のネットワークから切断されました",
+    "commands.computercraft.desc": "/computercraft コマンドは、コンピュータとの制御および対話するためのさまざまなデバッグツールと管理者ツールを提供します。",
+    "commands.computercraft.dump.desc": "すべてのコンピューターの状態、または一台のコンピューターの特定の情報を表示する。 コンピュータのインスタンスID (例えば 123), コンピュータID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
+    "commands.computercraft.shutdown.desc": "指定されたコンピュータ、指定されていない場合はすべてのコンピュータをシャットダウンします。 コンピュータのインスタンスID (例えば 123), コンピュータID (例えば #123) またはラベル (例えば \\\"@My Computer\\\") を指定することができます。",
+    "commands.computercraft.tp.desc": "コンピュータの場所にテレポート.コンピュータのインスタンスID（例えば 123）またはコンピュータID（例えば #123）を指定することができます。",
+    "commands.computercraft.view.desc": "コンピュータのターミナルを開き、コンピュータのリモートコントロールを可能にします。 これはタートルのインベントリへのアクセスを提供しません。 コンピュータのインスタンスID（例えば 123）またはコンピュータID（例えば #123）を指定することができます。",
+    "commands.computercraft.track.desc": "コンピュータの実行時間を追跡するだけでなく、イベントを確認することができます。 これは /forge と同様の方法で情報を提示し、遅れを診断するのに役立ちます。",
+    "commands.computercraft.track.stop.desc": "すべてのコンピュータのイベントと実行時間の追跡を停止します",
+    "commands.computercraft.track.dump.computer": "コンピューター",
+    "commands.computercraft.reload.desc": "コンピュータークラフトのコンフィグファイルを再読み込みします",
+    "commands.computercraft.queue.desc": "追加の引数を通過する computer_command インベントをコマンドコンピューターに送信します。これは主にマップメーカーのために設計されており、よりコンピュータフレンドリーバージョンの /trigger として機能します。 どのプレイヤーでもコマンドを実行できます。これは、テキストコンポーネントのクリックイベントを介して行われる可能性があります。",
+    "tracking_field.computercraft.peripheral.name": "実行呼び出し",
+    "tracking_field.computercraft.coroutines_created.name": "コルーチン作成",
+    "gui.computercraft.tooltip.turn_off": "このコンピュータをオフにする",
+    "gui.computercraft.upload.success.msg": "%d個のファイルがアップロードされました。",
+    "gui.computercraft.upload.failed.computer_off": "ファイルをアップロードする前にコンピュータを起動する必要があります。",
+    "gui.computercraft.upload.overwrite.detail": "アップロード時に次のファイルが上書きされます。継続しますか？%s"
+}
diff --git a/src/main/resources/assets/computercraft/lang/nl_nl.json b/src/main/resources/assets/computercraft/lang/nl_nl.json
index 98a174583..40a14c9df 100644
--- a/src/main/resources/assets/computercraft/lang/nl_nl.json
+++ b/src/main/resources/assets/computercraft/lang/nl_nl.json
@@ -51,9 +51,6 @@
     "commands.computercraft.shutdown.synopsis": "Sluit computers af op afstand.",
     "commands.computercraft.shutdown.desc": "Sluit alle genoemde computers af, of geen enkele wanneer niet gespecificeerd. Je kunt een instance-id (bijv. 123), computer-id (bijv. #123) of computer-label (bijv. \\\"@Mijn Computer\\\") opgeven.",
     "commands.computercraft.shutdown.done": "%s/%s computers afgesloten",
-    "commands.computercraft.track.stop.not_enabled": "Er worden op dit moment geen computers bijgehouden",
-    "commands.computercraft.track.dump.desc": "Dump de laatste resultaten van het bijhouden van computers.",
-    "commands.computercraft.queue.desc": "Verzend een computer_commando event naar een commandocomputer. Additionele argumenten worden doorgegeven. Dit is vooral bedoeld voor mapmakers. Het doet dienst als een computer-vriendelijke versie van /trigger. Elke speler kan het commando uitvoeren, wat meestal gedaan zal worden door een text-component klik-event.",
     "commands.computercraft.turn_on.synopsis": "Zet computers aan op afstand.",
     "commands.computercraft.turn_on.desc": "Zet de genoemde computers aan op afstand. Je kunt een instance-id (bijv. 123), computer-id (bijv. #123) of computer-label (bijv. \"@Mijn Computer\") opgeven.",
     "commands.computercraft.turn_on.done": "%s/%s computers aangezet",
@@ -74,12 +71,17 @@
     "commands.computercraft.track.stop.synopsis": "Stop het bijhouden van alle computers",
     "commands.computercraft.track.stop.desc": "Stop het bijhouden van uitvoertijd en aantal behandelde events van alle computers",
     "commands.computercraft.track.stop.action": "Klik om bijhouden te stoppen",
+    "commands.computercraft.track.stop.not_enabled": "Er worden op dit moment geen computers bijgehouden",
+    "commands.computercraft.track.dump.synopsis": "Dump de laatste resultaten van het bijhouden van computers",
+    "commands.computercraft.track.dump.desc": "Dump de laatste resultaten van het bijhouden van computers.",
     "commands.computercraft.track.dump.no_timings": "Geen tijden beschikbaar",
     "commands.computercraft.track.dump.computer": "Computer",
     "commands.computercraft.reload.synopsis": "Herlaad het ComputerCraft configuratiebestand",
     "commands.computercraft.reload.desc": "Herlaad het ComputerCraft configuratiebestand",
     "commands.computercraft.reload.done": "Configuratie herladen",
     "commands.computercraft.queue.synopsis": "Verzend een computer_command event naar een commandocomputer",
+    "commands.computercraft.queue.desc": "Verzend een computer_commando event naar een commandocomputer. Additionele argumenten worden doorgegeven. Dit is vooral bedoeld voor mapmakers. Het doet dienst als een computer-vriendelijke versie van /trigger. Elke speler kan het commando uitvoeren, wat meestal gedaan zal worden door een text-component klik-event.",
+    "commands.computercraft.generic.no_position": "<geen positie>",
     "commands.computercraft.generic.position": "%s, %s, %s",
     "commands.computercraft.generic.yes": "J",
     "commands.computercraft.generic.no": "N",
@@ -87,6 +89,7 @@
     "commands.computercraft.generic.additional_rows": "%d additionele rijen…",
     "argument.computercraft.computer.no_matching": "Geen computer matcht '%s'",
     "argument.computercraft.computer.many_matching": "Meerdere computers matchen '%s' (instanties %s)",
+    "argument.computercraft.tracking_field.no_field": "Onbekend veld '%s'",
     "argument.computercraft.argument_expected": "Argument verwacht",
     "tracking_field.computercraft.tasks.name": "Taken",
     "tracking_field.computercraft.total.name": "Totale tijd",
@@ -95,19 +98,16 @@
     "tracking_field.computercraft.server_count.name": "Aantal server-taken",
     "tracking_field.computercraft.server_time.name": "Server-taak tijd",
     "tracking_field.computercraft.peripheral.name": "Randapparatuur aanroepen",
+    "tracking_field.computercraft.fs.name": "Restandssysteem operaties",
     "tracking_field.computercraft.turtle.name": "Turtle operaties",
     "tracking_field.computercraft.http.name": "HTTP verzoeken",
     "tracking_field.computercraft.http_upload.name": "HTTP upload",
+    "tracking_field.computercraft.http_download.name": "HTTP download",
     "tracking_field.computercraft.websocket_incoming.name": "Websocket inkomend",
     "tracking_field.computercraft.websocket_outgoing.name": "Websocket uitgaand",
     "tracking_field.computercraft.coroutines_created.name": "Coroutines gecreëerd",
+    "tracking_field.computercraft.coroutines_dead.name": "Coroutines verwijderd",
     "gui.computercraft.tooltip.copy": "Kopiëren naar klembord",
     "gui.computercraft.tooltip.computer_id": "Computer ID: %s",
-    "gui.computercraft.tooltip.disk_id": "Diskette ID: %s",
-    "tracking_field.computercraft.http_download.name": "HTTP download",
-    "commands.computercraft.generic.no_position": "<geen positie>",
-    "commands.computercraft.track.dump.synopsis": "Dump de laatste resultaten van het bijhouden van computers",
-    "tracking_field.computercraft.fs.name": "Restandssysteem operaties",
-    "tracking_field.computercraft.coroutines_dead.name": "Coroutines verwijderd",
-    "argument.computercraft.tracking_field.no_field": "Onbekend veld '%s'"
+    "gui.computercraft.tooltip.disk_id": "Diskette ID: %s"
 }
diff --git a/src/main/resources/assets/computercraft/lang/pt_br.json b/src/main/resources/assets/computercraft/lang/pt_br.json
index f5ec8017a..6f67e0cbc 100644
--- a/src/main/resources/assets/computercraft/lang/pt_br.json
+++ b/src/main/resources/assets/computercraft/lang/pt_br.json
@@ -38,21 +38,21 @@
     "upgrade.computercraft.speaker.adjective": "(Alto-Falante)",
     "chat.computercraft.wired_modem.peripheral_connected": "Periférico \"%s\" conectado à rede",
     "chat.computercraft.wired_modem.peripheral_disconnected": "Periférico \"%s\" desconectado da rede",
-    "gui.computercraft.tooltip.copy": "Copiar para a área de transferência",
-    "commands.computercraft.tp.synopsis": "Teleprota para um computador específico.",
-    "commands.computercraft.turn_on.done": "Ligou %s/%s computadores",
-    "commands.computercraft.turn_on.desc": "Liga os computadores em escuta. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
-    "commands.computercraft.turn_on.synopsis": "Liga computadores remotamente.",
-    "commands.computercraft.shutdown.done": "Desliga %s/%s computadores",
-    "commands.computercraft.shutdown.desc": "Desliga os computadores em escuta ou todos caso não tenha sido especificado. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
-    "commands.computercraft.shutdown.synopsis": "Desliga computadores remotamente.",
-    "commands.computercraft.dump.action": "Ver mais informação sobre este computador",
-    "commands.computercraft.dump.desc": "Mostra o status de todos os computadores ou uma informação específica sobre um computador. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
-    "commands.computercraft.dump.synopsis": "Mostra status de computadores.",
-    "commands.computercraft.help.no_command": "Comando '%s' não existe",
-    "commands.computercraft.help.no_children": "%s não tem sub-comandos",
-    "commands.computercraft.help.desc": "Mostra essa mensagem de ajuda",
-    "commands.computercraft.help.synopsis": "Providencia ajuda para um comando específico",
+    "commands.computercraft.synopsis": "Vários comandos para controlar computadores.",
     "commands.computercraft.desc": "O comando /computercraft providencia várias ferramentas de depuração e administração para controle e interação com computadores.",
-    "commands.computercraft.synopsis": "Vários comandos para controlar computadores."
+    "commands.computercraft.help.synopsis": "Providencia ajuda para um comando específico",
+    "commands.computercraft.help.desc": "Mostra essa mensagem de ajuda",
+    "commands.computercraft.help.no_children": "%s não tem sub-comandos",
+    "commands.computercraft.help.no_command": "Comando '%s' não existe",
+    "commands.computercraft.dump.synopsis": "Mostra status de computadores.",
+    "commands.computercraft.dump.desc": "Mostra o status de todos os computadores ou uma informação específica sobre um computador. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
+    "commands.computercraft.dump.action": "Ver mais informação sobre este computador",
+    "commands.computercraft.shutdown.synopsis": "Desliga computadores remotamente.",
+    "commands.computercraft.shutdown.desc": "Desliga os computadores em escuta ou todos caso não tenha sido especificado. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
+    "commands.computercraft.shutdown.done": "Desliga %s/%s computadores",
+    "commands.computercraft.turn_on.synopsis": "Liga computadores remotamente.",
+    "commands.computercraft.turn_on.desc": "Liga os computadores em escuta. Você pode especificar o id de instância do computador (ex.: 123), id do computador (ex.: #123) ou o rótulo (ex.: \"@MeuComputador\").",
+    "commands.computercraft.turn_on.done": "Ligou %s/%s computadores",
+    "commands.computercraft.tp.synopsis": "Teleprota para um computador específico.",
+    "gui.computercraft.tooltip.copy": "Copiar para a área de transferência"
 }
diff --git a/src/main/resources/assets/computercraft/lang/ru.json b/src/main/resources/assets/computercraft/lang/ru.json
deleted file mode 100644
index 210b77091..000000000
--- a/src/main/resources/assets/computercraft/lang/ru.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "block.computercraft.computer_normal": "Компьютер",
-    "block.computercraft.computer_advanced": "Улучшенный компьютер",
-    "block.computercraft.computer_command": "Командный компьютер",
-    "block.computercraft.disk_drive": "Дисковод",
-    "block.computercraft.printer": "Принтер",
-    "block.computercraft.speaker": "Колонка",
-    "block.computercraft.monitor_normal": "Монитор",
-    "block.computercraft.monitor_advanced": "Улучшенный монитор",
-    "block.computercraft.wireless_modem_normal": "Беспроводной модем",
-    "block.computercraft.wireless_modem_advanced": "Эндер модем",
-    "block.computercraft.wired_modem": "Проводной модем",
-    "block.computercraft.cable": "Сетевой кабель",
-    "block.computercraft.turtle_normal.upgraded": "%s черепашка",
-    "block.computercraft.turtle_advanced": "Улучшенная черепашка",
-    "block.computercraft.turtle_advanced.upgraded": "Улучшенная %s черепашка",
-    "block.computercraft.turtle_advanced.upgraded_twice": "Улучшенная %s %s черепашка",
-    "item.computercraft.treasure_disk": "Дискета",
-    "item.computercraft.printed_page": "Напечатанная страница",
-    "item.computercraft.printed_book": "Напечатанная книга",
-    "item.computercraft.pocket_computer_normal": "Карманный компьютер",
-    "item.computercraft.pocket_computer_normal.upgraded": "%s карманный компьютер",
-    "item.computercraft.pocket_computer_advanced.upgraded": "Улучшенный %s карманный компьютер",
-    "upgrade.minecraft.diamond_sword.adjective": "Боевая",
-    "upgrade.minecraft.diamond_shovel.adjective": "Копающая",
-    "upgrade.minecraft.diamond_pickaxe.adjective": "Добывающая",
-    "upgrade.minecraft.diamond_axe.adjective": "Рубящая",
-    "upgrade.minecraft.diamond_hoe.adjective": "Возделывающая",
-    "upgrade.minecraft.crafting_table.adjective": "Крафтящая",
-    "upgrade.computercraft.wireless_modem_advanced.adjective": "Эндер",
-    "upgrade.computercraft.speaker.adjective": "Шумящий",
-    "chat.computercraft.wired_modem.peripheral_connected": "Устройство \"%s\" подключено к сети",
-    "commands.computercraft.synopsis": "Команды для управления компьютерами.",
-    "commands.computercraft.help.synopsis": "Получить подсказку по одной из команд",
-    "commands.computercraft.help.desc": "Показывает этот текст",
-    "commands.computercraft.help.no_children": "%s не имеет подкоманд",
-    "commands.computercraft.help.no_command": "Нет команды '%s'",
-    "commands.computercraft.dump.synopsis": "Показать статус компьютеров.",
-    "commands.computercraft.dump.action": "Показать больше информации об этом компьютере",
-    "commands.computercraft.shutdown.synopsis": "Удалённо выключить компьютер.",
-    "commands.computercraft.shutdown.done": "%s/%s компьютеров выключено",
-    "commands.computercraft.turn_on.synopsis": "Удалённо включить компьютеры.",
-    "commands.computercraft.turn_on.done": "%s/%s компьютеров включено",
-    "commands.computercraft.tp.synopsis": "Телепортироваться к компьютеру.",
-    "commands.computercraft.tp.desc": "Телепортироваться к месту установки компьютера. Можно указать номер инстанса (например 123) или идентификатор компьютера (#123).",
-    "commands.computercraft.tp.action": "Телепортироваться к этому компьютеру",
-    "commands.computercraft.tp.not_there": "Невозможно найти компьютер в мире",
-    "commands.computercraft.view.synopsis": "Показать терминал компьютера.",
-    "commands.computercraft.view.not_player": "Нельзя открыть терминал для не-игрока",
-    "commands.computercraft.view.action": "Открыть этот компьютер",
-    "commands.computercraft.track.synopsis": "Отслеживание метрик компьютеров.",
-    "commands.computercraft.track.start.synopsis": "Начать собирать метрики со всех компьютеров",
-    "commands.computercraft.track.start.desc": "Начать собирать метрики со всех компьютеров: сколько времени выполняется код и сколько событий обрабатывается. Это сотрёт результаты предыдущего сбора.",
-    "commands.computercraft.track.start.stop": "Запустите %s чтобы остановить сбор метрик и посмотреть результаты",
-    "commands.computercraft.track.stop.action": "Остановить сбор метрик",
-    "commands.computercraft.track.stop.not_enabled": "Сбор метрик не был запущен",
-    "commands.computercraft.track.dump.synopsis": "Вывести результаты сбора метрик",
-    "commands.computercraft.track.dump.desc": "Вывести результаты последнего сбора метрик.",
-    "commands.computercraft.track.dump.no_timings": "Нет доступных результатов сбора метрик",
-    "commands.computercraft.track.dump.computer": "Компьютер",
-    "commands.computercraft.reload.synopsis": "Перезагрузить конфигурацию ComputerCraft",
-    "commands.computercraft.reload.done": "Конфигурация перезагружена",
-    "commands.computercraft.queue.desc": "Отправить событие computer_command командному компьютеру. Это нужно для создателей карт, более дружественная версия /trigger. Любой игрок сможет запустить команду, которая скорее всего будет выполнена с помощью click event текстового компонента.",
-    "commands.computercraft.generic.no_position": "<нет позиции>",
-    "commands.computercraft.generic.position": "%s, %s, %s",
-    "commands.computercraft.generic.yes": "Д",
-    "commands.computercraft.generic.no": "Н",
-    "commands.computercraft.generic.exception": "Необработанное исключение (%s)",
-    "commands.computercraft.generic.additional_rows": "%d дополнительных строк…",
-    "argument.computercraft.computer.no_matching": "Нет компьютеров совпадающих с '%s'",
-    "argument.computercraft.tracking_field.no_field": "Неизвестное поле '%s'",
-    "argument.computercraft.argument_expected": "Ожидается аргумент",
-    "tracking_field.computercraft.tasks.name": "Задачи",
-    "tracking_field.computercraft.total.name": "Общее время",
-    "tracking_field.computercraft.average.name": "Среднее время",
-    "tracking_field.computercraft.max.name": "Максимальное время",
-    "tracking_field.computercraft.server_count.name": "Число серверных задач",
-    "tracking_field.computercraft.server_time.name": "Время серверных задач",
-    "tracking_field.computercraft.fs.name": "Операций с файлами",
-    "tracking_field.computercraft.turtle.name": "Действий черепашек",
-    "tracking_field.computercraft.http.name": "HTTP запросы",
-    "tracking_field.computercraft.http_upload.name": "HTTP загрузки",
-    "tracking_field.computercraft.http_download.name": "HTTP скачивания",
-    "tracking_field.computercraft.websocket_outgoing.name": "Исходящие вебсокеты",
-    "tracking_field.computercraft.coroutines_created.name": "Корутин создано",
-    "tracking_field.computercraft.coroutines_dead.name": "Корутин удалено",
-    "gui.computercraft.tooltip.copy": "Скопировать в буфер обмена",
-    "gui.computercraft.tooltip.disk_id": "ID дискеты: %s",
-    "itemGroup.computercraft": "ComputerCraft",
-    "block.computercraft.wired_modem_full": "Проводной модем",
-    "block.computercraft.turtle_normal": "Черепашка",
-    "block.computercraft.turtle_normal.upgraded_twice": "%s %s черепашка",
-    "item.computercraft.disk": "Дискета",
-    "item.computercraft.printed_pages": "Напечатанные страницы",
-    "item.computercraft.pocket_computer_advanced": "Улучшенный карманный компьютер",
-    "upgrade.computercraft.wireless_modem_normal.adjective": "Беспроводный",
-    "chat.computercraft.wired_modem.peripheral_disconnected": "Устройство \"%s\" отключено от сети",
-    "commands.computercraft.desc": "Команда /computercraft предоставляет отладочные и административные утилиты для управления компьютерами.",
-    "commands.computercraft.dump.desc": "Показать статус всех компьютеров или информацию об одном из компьютеров. Можно указать номер инстанса (например 123), идентификатор компьютера (#123) или метку (\"@My Computer\").",
-    "commands.computercraft.shutdown.desc": "Выключить указанные компьютеры или все. Можно указать номер инстанса (например 123), идентификатор компьютера (#123) или метку (\"@My Computer\").",
-    "commands.computercraft.turn_on.desc": "Включить указанные компьютеры. Можно указать номер инстанса (например 123), идентификатор компьютера (#123) или метку (\"@My Computer\").",
-    "commands.computercraft.tp.not_player": "Нельзя открыть терминал для не-игрока",
-    "commands.computercraft.view.desc": "Открыть терминал и получить контроль над компьютером. Это не показывает инвентарь черепашек. Можно указать номер инстанса (например 123) или идентификатор компьютера (#123).",
-    "commands.computercraft.track.desc": "Отслеживание как долго компьютеры выполняют код, как много событий они обрабатывают. Это показывает информацию аналогично /forge track и может быть полезно в поиске причин лагов.",
-    "commands.computercraft.track.stop.synopsis": "Остановить сбор метрик со всех компьютеров",
-    "commands.computercraft.track.stop.desc": "Остановить сбор метрик со всех компьютеров: сколько времени выполняется код и сколько событий обрабатывается",
-    "commands.computercraft.reload.desc": "Перезагрузить конфигурацию ComputerCraft",
-    "commands.computercraft.queue.synopsis": "Отправить событие computer_command командному компьютеру",
-    "argument.computercraft.computer.many_matching": "Несколько компьютеров совпадают с '%s' (инстансы %s)",
-    "tracking_field.computercraft.peripheral.name": "Вызовы периферийных устройств",
-    "tracking_field.computercraft.websocket_incoming.name": "Входящие вебсокеты",
-    "gui.computercraft.tooltip.computer_id": "ID компьютера: %s"
-}
diff --git a/src/main/resources/assets/computercraft/lang/ru_ru.json b/src/main/resources/assets/computercraft/lang/ru_ru.json
new file mode 100644
index 000000000..1c6a51bec
--- /dev/null
+++ b/src/main/resources/assets/computercraft/lang/ru_ru.json
@@ -0,0 +1,131 @@
+{
+    "itemGroup.computercraft": "ComputerCraft",
+    "block.computercraft.computer_normal": "Компьютер",
+    "block.computercraft.computer_advanced": "Продвинутый компьютер",
+    "block.computercraft.computer_command": "Командный компьютер",
+    "block.computercraft.disk_drive": "Дисковод",
+    "block.computercraft.printer": "Принтер",
+    "block.computercraft.speaker": "Колонка",
+    "block.computercraft.monitor_normal": "Монитор",
+    "block.computercraft.monitor_advanced": "Продвинутый монитор",
+    "block.computercraft.wireless_modem_normal": "Беспроводной модем",
+    "block.computercraft.wireless_modem_advanced": "Эндер модем",
+    "block.computercraft.wired_modem": "Проводной модем",
+    "block.computercraft.cable": "Сетевой кабель",
+    "block.computercraft.wired_modem_full": "Проводной модем",
+    "block.computercraft.turtle_normal": "Черепашка",
+    "block.computercraft.turtle_normal.upgraded": "%s черепашка",
+    "block.computercraft.turtle_normal.upgraded_twice": "%s %s черепашка",
+    "block.computercraft.turtle_advanced": "Продвинутая черепашка",
+    "block.computercraft.turtle_advanced.upgraded": "Продвинутая черепашка: %s",
+    "block.computercraft.turtle_advanced.upgraded_twice": "Продвинутая %s %s черепашка",
+    "item.computercraft.disk": "Дискета",
+    "item.computercraft.treasure_disk": "Дискета",
+    "item.computercraft.printed_page": "Напечатанная страница",
+    "item.computercraft.printed_pages": "Напечатанные страницы",
+    "item.computercraft.printed_book": "Напечатанная книга",
+    "item.computercraft.pocket_computer_normal": "Карманный компьютер",
+    "item.computercraft.pocket_computer_normal.upgraded": "%s карманный компьютер",
+    "item.computercraft.pocket_computer_advanced": "Продвинутый карманный компьютер",
+    "item.computercraft.pocket_computer_advanced.upgraded": "Продвинутый %s карманный компьютер",
+    "upgrade.minecraft.diamond_sword.adjective": "Боевая",
+    "upgrade.minecraft.diamond_shovel.adjective": "Копающая",
+    "upgrade.minecraft.diamond_pickaxe.adjective": "Добывающая",
+    "upgrade.minecraft.diamond_axe.adjective": "Рубящая",
+    "upgrade.minecraft.diamond_hoe.adjective": "Возделывающая",
+    "upgrade.minecraft.crafting_table.adjective": "Умелая",
+    "upgrade.computercraft.wireless_modem_normal.adjective": "Беспроводной",
+    "upgrade.computercraft.wireless_modem_advanced.adjective": "Эндер",
+    "upgrade.computercraft.speaker.adjective": "Шумящий",
+    "chat.computercraft.wired_modem.peripheral_connected": "Периферийное устройство \"%s\" подключено к сети",
+    "chat.computercraft.wired_modem.peripheral_disconnected": "Периферийное устройство \"%s\" отключено от сети",
+    "commands.computercraft.synopsis": "Различные команды для управления компьютерами.",
+    "commands.computercraft.desc": "Команда /computercraft предоставляет различные Отладочные и Административные инструменты для управления и взаимодействия с компьютерами.",
+    "commands.computercraft.help.synopsis": "Предоставляет помощь для конкретных команд",
+    "commands.computercraft.help.desc": "Отображает это сообщение справки",
+    "commands.computercraft.help.no_children": "%s не имеет подкоманд",
+    "commands.computercraft.help.no_command": "Нет такой команды '%s'",
+    "commands.computercraft.dump.synopsis": "Отобразить состояние компьютеров.",
+    "commands.computercraft.dump.desc": "Отображает состояние всех компьютеров или конкретной информации об одном компьютере. Ты можешь указать идентификатор экземпляра компьютера (например 123), идентификатор компьютера (например #123) или метку (например \"@Мой компьютер\").",
+    "commands.computercraft.dump.action": "Просмотреть информацию об этом компьютере",
+    "commands.computercraft.dump.open_path": "Просмотреть файлы этого компьютера",
+    "commands.computercraft.shutdown.synopsis": "Удалённо завершить работу компьютеров.",
+    "commands.computercraft.shutdown.desc": "Завершить работу перечисленных компьютеров или все, если ни один не указан. Ты можешь указать идентификатор экземпляра компьютера (например 123), идентификатор компьютера (например #123) или метку (например \"@Мой компьютер\").",
+    "commands.computercraft.shutdown.done": "У %s/%s компьютеров завершена работа",
+    "commands.computercraft.turn_on.synopsis": "Включить компьютеры удалённо.",
+    "commands.computercraft.turn_on.desc": "Включить перечисленные компьютеры. Ты можешь указать идентификатор экземпляра компьютера (например 123), идентификатор компьютера (например #123) или метку (например \"@Мой компьютер\").",
+    "commands.computercraft.turn_on.done": "%s/%s компьютеров включено",
+    "commands.computercraft.tp.synopsis": "Телепортироваться к конкретному компьютеру.",
+    "commands.computercraft.tp.desc": "Телепортироваться к местоположению компьютера. Ты можешь указать либо идентификатор экземпляра компьютера (например 123) либо идентификатор компьютера (например #123).",
+    "commands.computercraft.tp.action": "Телепортироваться к этому компьютеру",
+    "commands.computercraft.tp.not_player": "Нельзя открыть терминал для не-игрока",
+    "commands.computercraft.tp.not_there": "Нельзя определить в мире местоположение компьютер",
+    "commands.computercraft.view.synopsis": "Просмотреть терминал компьютера.",
+    "commands.computercraft.view.desc": "Открыть терминал компьютера, позволяющий удалённо управлять компьютером. Это не предоставляет доступ к инвентарям черепашек. Ты можешь указать либо идентификатор экземпляра компьютера (например 123) либо идентификатор компьютера (например #123).",
+    "commands.computercraft.view.action": "Просмотреть этот компьютер",
+    "commands.computercraft.view.not_player": "Нельзя открыть терминал для не-игрока",
+    "commands.computercraft.track.synopsis": "Отслеживание сред выполнения для компьютеров.",
+    "commands.computercraft.track.desc": "Отслеживает, как долго компьютеры исполняют, а также то, как много они обрабатывают события. Эта информация представляется аналогично к /forge track и может быть полезной для диагностики лага.",
+    "commands.computercraft.track.start.synopsis": "Начать отслеживание всех компьютеров",
+    "commands.computercraft.track.start.desc": "Начать отслеживание всех сред выполнения компьютера и число событий. Это отменит результаты и предыдущие запуски.",
+    "commands.computercraft.track.start.stop": "Запустить %s, чтобы остановить отслеживание и просмотреть результаты",
+    "commands.computercraft.track.stop.synopsis": "Прекратить отслеживание всех компьютеров",
+    "commands.computercraft.track.stop.desc": "Прекратить отслеживание всех событий компьютера и сред выполнения",
+    "commands.computercraft.track.stop.action": "Нажми, чтобы прекратить отслеживание",
+    "commands.computercraft.track.stop.not_enabled": "В данных момент нет отслеживающих компьютеров",
+    "commands.computercraft.track.dump.synopsis": "Вывести последние результаты отслеживания",
+    "commands.computercraft.track.dump.desc": "Вывести последние результаты отслеживания компьютера.",
+    "commands.computercraft.track.dump.no_timings": "Нет доступных расписаний",
+    "commands.computercraft.track.dump.computer": "Компьютер",
+    "commands.computercraft.reload.synopsis": "Перезагрузить файл конфигурации ComputerCraft'a",
+    "commands.computercraft.reload.desc": "Перезагружает файл конфигурации ComputerCraft'a",
+    "commands.computercraft.reload.done": "Конфигурация перезагружена",
+    "commands.computercraft.queue.synopsis": "Отправить событие computer_command к Командному компьютеру",
+    "commands.computercraft.queue.desc": "Отправить событие computer_command к Командному компьютеру, проходящий через дополнительные аргументы. В основном это предназначено для Картоделов, действует как более удобная для пользователя компьютерная версия /trigger. Любой игрок сможет запустить команду, которая, по всей вероятности, будет сделана через события щелчка текстового компонента.",
+    "commands.computercraft.generic.no_position": "<нет позиции>",
+    "commands.computercraft.generic.position": "%s, %s, %s",
+    "commands.computercraft.generic.yes": "Y",
+    "commands.computercraft.generic.no": "N",
+    "commands.computercraft.generic.exception": "Необработанное исключение (%s)",
+    "commands.computercraft.generic.additional_rows": "%d дополнительных строк …",
+    "argument.computercraft.computer.no_matching": "Нет соответствующих компьютеров с '%s'",
+    "argument.computercraft.computer.many_matching": "Несколько компьютеров соответствуют с '%s' (экземпляры %s)",
+    "argument.computercraft.tracking_field.no_field": "Неизвестное поле '%s'",
+    "argument.computercraft.argument_expected": "Ожидается аргумент",
+    "tracking_field.computercraft.tasks.name": "Задачи",
+    "tracking_field.computercraft.total.name": "Общее время",
+    "tracking_field.computercraft.average.name": "Среднее время",
+    "tracking_field.computercraft.max.name": "Максимальное время",
+    "tracking_field.computercraft.server_count.name": "Число серверных задач",
+    "tracking_field.computercraft.server_time.name": "Время серверных задач",
+    "tracking_field.computercraft.peripheral.name": "Вызовы периферийных устройств",
+    "tracking_field.computercraft.fs.name": "Операции с файловой системой",
+    "tracking_field.computercraft.turtle.name": "Операции с черепашкой",
+    "tracking_field.computercraft.http.name": "HTTP запросы",
+    "tracking_field.computercraft.http_upload.name": "HTTP загрузки",
+    "tracking_field.computercraft.http_download.name": "HTTP скачивания",
+    "tracking_field.computercraft.websocket_incoming.name": "Входящий Websocket",
+    "tracking_field.computercraft.websocket_outgoing.name": "Исходящий Websocket",
+    "tracking_field.computercraft.coroutines_created.name": "Сопрограмма создана",
+    "tracking_field.computercraft.coroutines_dead.name": "Сопрограмма удалена",
+    "gui.computercraft.tooltip.copy": "Скопировано в Буфер обмена",
+    "gui.computercraft.tooltip.computer_id": "Идентификатор компьютера: %s",
+    "gui.computercraft.tooltip.disk_id": "Идентификатор диска: %s",
+    "gui.computercraft.tooltip.turn_on": "Включить этот компьютер",
+    "gui.computercraft.tooltip.turn_on.key": "Удерживай Ctrl+R",
+    "gui.computercraft.tooltip.turn_off": "Выключить этот компьютер",
+    "gui.computercraft.tooltip.turn_off.key": "Удерживай Ctrl+S",
+    "gui.computercraft.tooltip.terminate": "Прекратить текущий запущенный код",
+    "gui.computercraft.tooltip.terminate.key": "Удерживай Ctrl+T",
+    "gui.computercraft.upload.success": "Загрузка успешна",
+    "gui.computercraft.upload.success.msg": "%d файлов загружено.",
+    "gui.computercraft.upload.failed": "Загрузка не удалась",
+    "gui.computercraft.upload.failed.out_of_space": "Недостаточно места в компьютере для этих файлов.",
+    "gui.computercraft.upload.failed.computer_off": "Ты должен включить компьютер перед загрузой файлов.",
+    "gui.computercraft.upload.failed.too_much": "Твои файлы слишком большие для загрузки.",
+    "gui.computercraft.upload.failed.overwrite_dir": "Нельзя загрузить %s, поскольку папка с таким же названием уже существует.",
+    "gui.computercraft.upload.failed.generic": "Загрузка файлов не удалась (%s)",
+    "gui.computercraft.upload.overwrite": "Файлы будут перезаписаны",
+    "gui.computercraft.upload.overwrite.detail": "При загрузке следующие файлы будут перезаписаны. Продолжить?%s",
+    "gui.computercraft.upload.overwrite_button": "Перезаписать"
+}
diff --git a/src/main/resources/assets/computercraft/lang/sv_se.json b/src/main/resources/assets/computercraft/lang/sv_se.json
index 1afe76b56..11ec014a3 100644
--- a/src/main/resources/assets/computercraft/lang/sv_se.json
+++ b/src/main/resources/assets/computercraft/lang/sv_se.json
@@ -1,4 +1,5 @@
 {
+    "itemGroup.computercraft": "ComputerCraft",
     "block.computercraft.computer_normal": "Dator",
     "block.computercraft.computer_advanced": "Avancerad Dator",
     "block.computercraft.computer_command": "Kommandodator",
@@ -38,76 +39,75 @@
     "upgrade.computercraft.speaker.adjective": "Högljudd",
     "chat.computercraft.wired_modem.peripheral_connected": "Kringutrustning \"%s\" är kopplad till nätverket",
     "chat.computercraft.wired_modem.peripheral_disconnected": "Kringutrustning \"%s\" är frånkopplad från nätverket",
-    "gui.computercraft.tooltip.copy": "Kopiera till urklipp",
-    "gui.computercraft.tooltip.disk_id": "Diskett-ID: %s",
-    "gui.computercraft.tooltip.computer_id": "Dator-ID: %s",
-    "tracking_field.computercraft.coroutines_dead.name": "Coroutines borttagna",
-    "tracking_field.computercraft.coroutines_created.name": "Coroutines skapade",
-    "tracking_field.computercraft.websocket_outgoing.name": "Websocket utgående",
-    "tracking_field.computercraft.websocket_incoming.name": "Websocket ingående",
-    "tracking_field.computercraft.http_download.name": "HTTP-nedladdning",
-    "tracking_field.computercraft.http_upload.name": "HTTP-uppladdning",
-    "tracking_field.computercraft.http.name": "HTTP-förfrågningar",
-    "tracking_field.computercraft.turtle.name": "Turtle-operationer",
-    "tracking_field.computercraft.fs.name": "Filsystemoperationer",
-    "tracking_field.computercraft.peripheral.name": "Samtal till kringutrustning",
-    "tracking_field.computercraft.server_time.name": "Serveraktivitetstid",
-    "tracking_field.computercraft.server_count.name": "Antal serveruppgifter",
-    "tracking_field.computercraft.max.name": "Max tid",
-    "tracking_field.computercraft.average.name": "Genomsnittlig tid",
-    "tracking_field.computercraft.total.name": "Total tid",
-    "tracking_field.computercraft.tasks.name": "Uppgifter",
-    "argument.computercraft.argument_expected": "Argument förväntas",
-    "argument.computercraft.tracking_field.no_field": "Okänt fält '%s'",
-    "argument.computercraft.computer.many_matching": "Flera datorer matchar '%s' (%s träffar)",
-    "argument.computercraft.computer.no_matching": "Inga datorer matchar '%s'",
-    "commands.computercraft.generic.additional_rows": "%d ytterligare rader…",
-    "commands.computercraft.generic.exception": "Ohanterat felfall (%s)",
-    "commands.computercraft.generic.no": "N",
-    "commands.computercraft.generic.yes": "J",
-    "commands.computercraft.generic.position": "%s, %s, %s",
-    "commands.computercraft.generic.no_position": "<no pos>",
-    "commands.computercraft.queue.desc": "Skicka ett computer_command event till en kommandodator, skicka vidare ytterligare argument. Detta är mestadels utformat för kartmarkörer som fungerar som en mer datorvänlig version av /trigger. Alla spelare kan köra kommandot, vilket sannolikt skulle göras genom en textkomponents klick-event.",
-    "commands.computercraft.queue.synopsis": "Skicka ett computer_command event till en kommandodator",
-    "commands.computercraft.reload.done": "Konfiguration omladdad",
-    "commands.computercraft.reload.desc": "Ladda om ComputerCrafts konfigurationsfil",
-    "commands.computercraft.reload.synopsis": "Ladda om ComputerCrafts konfigurationsfil",
-    "commands.computercraft.track.dump.computer": "Dator",
-    "commands.computercraft.track.dump.no_timings": "Inga tidtagningar tillgängliga",
-    "commands.computercraft.track.dump.desc": "Dumpa de senaste resultaten av datorspårning.",
-    "commands.computercraft.track.dump.synopsis": "Dumpa de senaste spårningsresultaten",
-    "commands.computercraft.track.stop.not_enabled": "Spårar för tillfället inga datorer",
-    "commands.computercraft.track.stop.action": "Klicka för att stoppa spårning",
-    "commands.computercraft.track.stop.desc": "Stoppa spårning av alla datorers körtider och eventräkningar",
-    "commands.computercraft.track.stop.synopsis": "Stoppa spårning för alla datorer",
-    "commands.computercraft.track.start.stop": "Kör %s för att stoppa spårning och visa resultaten",
-    "commands.computercraft.track.start.desc": "Börja spåra alla dators körtider och eventräkningar. Detta kommer återställa resultaten från tidigare körningar.",
-    "commands.computercraft.track.start.synopsis": "Starta spårning för alla datorer",
-    "commands.computercraft.track.desc": "Spåra hur länge datorer exekverar, och även hur många event de hanterar. Detta presenterar information på liknande sätt som /forge track och kan vara användbart för att undersöka lagg.",
-    "commands.computercraft.track.synopsis": "Spåra körningstider för denna dator.",
-    "commands.computercraft.view.not_player": "Kan inte öppna terminalen för en ickespelare",
-    "commands.computercraft.view.action": "Titta på denna dator",
-    "commands.computercraft.view.desc": "Öppna datorns terminal för att möjligöra fjärrstyrning. Detta ger inte tillgång till turtlens inventory. Du kan ange en dators instans-id (t.ex. 123) eller dator-id (t.ex. #123).",
-    "commands.computercraft.view.synopsis": "Titta på datorns terminal.",
-    "commands.computercraft.tp.not_there": "Kan inte hitta datorn i världen",
-    "commands.computercraft.tp.not_player": "Kan inte öppna terminalen för en ickespelare",
-    "commands.computercraft.tp.action": "Teleportera till den här datorn",
-    "commands.computercraft.tp.desc": "Teleportera till datorns position. Du kan ange en dators instans-id (t.ex. 123), dator-id (t.ex. #123) eller etikett (t.ex. \"@Min dator\").",
-    "commands.computercraft.tp.synopsis": "Teleportera till en specifik dator.",
-    "commands.computercraft.turn_on.done": "Startade %s/%s datorer",
-    "commands.computercraft.turn_on.desc": "Starta de listade datorerna eller alla om ingen anges. Du kan ange en dators instans-id (t.ex. 123), dator-id (t.ex. #123) eller etikett (t.ex. \"@Min dator\").",
-    "commands.computercraft.turn_on.synopsis": "Starta på datorer på distans.",
-    "commands.computercraft.shutdown.done": "Stängde av %s/%s datorer",
-    "commands.computercraft.dump.desc": "Visa status för alla datorer eller specifik information för en dator. Du kan ange en dators instans-id (t.ex. 123), dator-id (t.ex. #123) eller etikett (t.ex. \"@Min dator\").",
-    "commands.computercraft.shutdown.desc": "Stäng av de listade datorerna eller alla om ingen anges. Du kan ange en dators instans-id (t.ex. 123), dator-id (t.ex. #123) eller etikett (t.ex. \"@Min dator\").",
-    "commands.computercraft.shutdown.synopsis": "Stäng av datorer på distans.",
-    "commands.computercraft.dump.action": "Visa mer information om den här datorn",
-    "commands.computercraft.dump.synopsis": "Visa status för datorer.",
-    "commands.computercraft.help.no_command": "Inget sådant kommando '%s'",
-    "commands.computercraft.help.no_children": "%s har inget underkommando",
-    "commands.computercraft.help.desc": "Visa detta hjälpmeddelande",
-    "commands.computercraft.help.synopsis": "Tillhandahåll hjälp för ett specifikt kommando",
-    "commands.computercraft.desc": "/computercraft kommandot tillhandahåller olika debugging- och administrationsverktyg för att kontrollera och interagera med datorer.",
     "commands.computercraft.synopsis": "Olika kommandon för att kontrollera datorer.",
-    "itemGroup.computercraft": "ComputerCraft"
+    "commands.computercraft.desc": "/computercraft kommandot tillhandahåller olika debugging- och administrationsverktyg för att kontrollera och interagera med datorer.",
+    "commands.computercraft.help.synopsis": "Tillhandahåll hjälp för ett specifikt kommando",
+    "commands.computercraft.help.desc": "Visa detta hjälpmeddelande",
+    "commands.computercraft.help.no_children": "%s har inget underkommando",
+    "commands.computercraft.help.no_command": "Inget sådant kommando '%s'",
+    "commands.computercraft.dump.synopsis": "Visa status för datorer.",
+    "commands.computercraft.dump.desc": "Visa status för alla datorer eller specifik information för en dator. Du kan ange en dators instans-id (t.ex. 123), dator-id (t.ex. #123) eller etikett (t.ex. \"@Min dator\").",
+    "commands.computercraft.dump.action": "Visa mer information om den här datorn",
+    "commands.computercraft.shutdown.synopsis": "Stäng av datorer på distans.",
+    "commands.computercraft.shutdown.desc": "Stäng av de listade datorerna eller alla om ingen anges. Du kan ange en dators instans-id (t.ex. 123), dator-id (t.ex. #123) eller etikett (t.ex. \"@Min dator\").",
+    "commands.computercraft.shutdown.done": "Stängde av %s/%s datorer",
+    "commands.computercraft.turn_on.synopsis": "Starta på datorer på distans.",
+    "commands.computercraft.turn_on.desc": "Starta de listade datorerna eller alla om ingen anges. Du kan ange en dators instans-id (t.ex. 123), dator-id (t.ex. #123) eller etikett (t.ex. \"@Min dator\").",
+    "commands.computercraft.turn_on.done": "Startade %s/%s datorer",
+    "commands.computercraft.tp.synopsis": "Teleportera till en specifik dator.",
+    "commands.computercraft.tp.desc": "Teleportera till datorns position. Du kan ange en dators instans-id (t.ex. 123), dator-id (t.ex. #123) eller etikett (t.ex. \"@Min dator\").",
+    "commands.computercraft.tp.action": "Teleportera till den här datorn",
+    "commands.computercraft.tp.not_player": "Kan inte öppna terminalen för en ickespelare",
+    "commands.computercraft.tp.not_there": "Kan inte hitta datorn i världen",
+    "commands.computercraft.view.synopsis": "Titta på datorns terminal.",
+    "commands.computercraft.view.desc": "Öppna datorns terminal för att möjligöra fjärrstyrning. Detta ger inte tillgång till turtlens inventory. Du kan ange en dators instans-id (t.ex. 123) eller dator-id (t.ex. #123).",
+    "commands.computercraft.view.action": "Titta på denna dator",
+    "commands.computercraft.view.not_player": "Kan inte öppna terminalen för en ickespelare",
+    "commands.computercraft.track.synopsis": "Spåra körningstider för denna dator.",
+    "commands.computercraft.track.desc": "Spåra hur länge datorer exekverar, och även hur många event de hanterar. Detta presenterar information på liknande sätt som /forge track och kan vara användbart för att undersöka lagg.",
+    "commands.computercraft.track.start.synopsis": "Starta spårning för alla datorer",
+    "commands.computercraft.track.start.desc": "Börja spåra alla dators körtider och eventräkningar. Detta kommer återställa resultaten från tidigare körningar.",
+    "commands.computercraft.track.start.stop": "Kör %s för att stoppa spårning och visa resultaten",
+    "commands.computercraft.track.stop.synopsis": "Stoppa spårning för alla datorer",
+    "commands.computercraft.track.stop.desc": "Stoppa spårning av alla datorers körtider och eventräkningar",
+    "commands.computercraft.track.stop.action": "Klicka för att stoppa spårning",
+    "commands.computercraft.track.stop.not_enabled": "Spårar för tillfället inga datorer",
+    "commands.computercraft.track.dump.synopsis": "Dumpa de senaste spårningsresultaten",
+    "commands.computercraft.track.dump.desc": "Dumpa de senaste resultaten av datorspårning.",
+    "commands.computercraft.track.dump.no_timings": "Inga tidtagningar tillgängliga",
+    "commands.computercraft.track.dump.computer": "Dator",
+    "commands.computercraft.reload.synopsis": "Ladda om ComputerCrafts konfigurationsfil",
+    "commands.computercraft.reload.desc": "Ladda om ComputerCrafts konfigurationsfil",
+    "commands.computercraft.reload.done": "Konfiguration omladdad",
+    "commands.computercraft.queue.synopsis": "Skicka ett computer_command event till en kommandodator",
+    "commands.computercraft.queue.desc": "Skicka ett computer_command event till en kommandodator, skicka vidare ytterligare argument. Detta är mestadels utformat för kartmarkörer som fungerar som en mer datorvänlig version av /trigger. Alla spelare kan köra kommandot, vilket sannolikt skulle göras genom en textkomponents klick-event.",
+    "commands.computercraft.generic.no_position": "<no pos>",
+    "commands.computercraft.generic.position": "%s, %s, %s",
+    "commands.computercraft.generic.yes": "J",
+    "commands.computercraft.generic.no": "N",
+    "commands.computercraft.generic.exception": "Ohanterat felfall (%s)",
+    "commands.computercraft.generic.additional_rows": "%d ytterligare rader…",
+    "argument.computercraft.computer.no_matching": "Inga datorer matchar '%s'",
+    "argument.computercraft.computer.many_matching": "Flera datorer matchar '%s' (%s träffar)",
+    "argument.computercraft.tracking_field.no_field": "Okänt fält '%s'",
+    "argument.computercraft.argument_expected": "Argument förväntas",
+    "tracking_field.computercraft.tasks.name": "Uppgifter",
+    "tracking_field.computercraft.total.name": "Total tid",
+    "tracking_field.computercraft.average.name": "Genomsnittlig tid",
+    "tracking_field.computercraft.max.name": "Max tid",
+    "tracking_field.computercraft.server_count.name": "Antal serveruppgifter",
+    "tracking_field.computercraft.server_time.name": "Serveraktivitetstid",
+    "tracking_field.computercraft.peripheral.name": "Samtal till kringutrustning",
+    "tracking_field.computercraft.fs.name": "Filsystemoperationer",
+    "tracking_field.computercraft.turtle.name": "Turtle-operationer",
+    "tracking_field.computercraft.http.name": "HTTP-förfrågningar",
+    "tracking_field.computercraft.http_upload.name": "HTTP-uppladdning",
+    "tracking_field.computercraft.http_download.name": "HTTP-nedladdning",
+    "tracking_field.computercraft.websocket_incoming.name": "Websocket ingående",
+    "tracking_field.computercraft.websocket_outgoing.name": "Websocket utgående",
+    "tracking_field.computercraft.coroutines_created.name": "Coroutines skapade",
+    "tracking_field.computercraft.coroutines_dead.name": "Coroutines borttagna",
+    "gui.computercraft.tooltip.copy": "Kopiera till urklipp",
+    "gui.computercraft.tooltip.computer_id": "Dator-ID: %s",
+    "gui.computercraft.tooltip.disk_id": "Diskett-ID: %s"
 }
diff --git a/src/main/resources/assets/computercraft/lang/vi_vn.json b/src/main/resources/assets/computercraft/lang/vi_vn.json
new file mode 100644
index 000000000..9364818af
--- /dev/null
+++ b/src/main/resources/assets/computercraft/lang/vi_vn.json
@@ -0,0 +1,48 @@
+{
+    "itemGroup.computercraft": "ComputerCraft",
+    "block.computercraft.computer_normal": "Máy tính",
+    "block.computercraft.computer_advanced": "Máy tính tiên tiến",
+    "block.computercraft.computer_command": "Máy tính điều khiển",
+    "block.computercraft.disk_drive": "Ỗ đĩa",
+    "block.computercraft.printer": "Máy in",
+    "block.computercraft.speaker": "Loa",
+    "block.computercraft.monitor_normal": "Màn hình",
+    "block.computercraft.monitor_advanced": "Màn hình tiên tiếng",
+    "block.computercraft.wireless_modem_normal": "Modem không dây",
+    "block.computercraft.wireless_modem_advanced": "Modem Ender",
+    "block.computercraft.wired_modem": "Modem có dây",
+    "block.computercraft.cable": "Dây cáp mạng",
+    "block.computercraft.wired_modem_full": "Modem có dây",
+    "block.computercraft.turtle_normal": "Rùa",
+    "block.computercraft.turtle_normal.upgraded": "Rùa %s",
+    "block.computercraft.turtle_normal.upgraded_twice": "Rùa %s %s",
+    "block.computercraft.turtle_advanced": "Rùa tiên tiến",
+    "block.computercraft.turtle_advanced.upgraded": "Rùa tiên tiến %s",
+    "block.computercraft.turtle_advanced.upgraded_twice": "Rùa tiên tiến %s %s",
+    "item.computercraft.disk": "Đĩa mềm",
+    "item.computercraft.treasure_disk": "Đĩa mềm",
+    "item.computercraft.printed_page": "Trang in",
+    "item.computercraft.printed_book": "Sách in",
+    "item.computercraft.pocket_computer_normal": "Máy tính bỏ túi",
+    "item.computercraft.pocket_computer_normal.upgraded": "Máy tính bỏ túi %s",
+    "item.computercraft.pocket_computer_advanced": "Máy tính bỏ túi tiên tiến",
+    "item.computercraft.pocket_computer_advanced.upgraded": "Máy tính bỏ túi tiên tiến %s",
+    "upgrade.minecraft.diamond_shovel.adjective": "Đào",
+    "upgrade.minecraft.diamond_pickaxe.adjective": "Khai thác",
+    "upgrade.minecraft.diamond_axe.adjective": "Đốn",
+    "upgrade.minecraft.diamond_hoe.adjective": "Trồng trọt",
+    "upgrade.minecraft.crafting_table.adjective": "Chế tạo",
+    "upgrade.computercraft.wireless_modem_normal.adjective": "Không dây",
+    "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender",
+    "upgrade.computercraft.speaker.adjective": "Ồn ào",
+    "tracking_field.computercraft.http.name": "Yêu cầu HTTP",
+    "tracking_field.computercraft.http_upload.name": "HTTP tải lên",
+    "tracking_field.computercraft.http_download.name": "HTTP tải xuống",
+    "tracking_field.computercraft.websocket_incoming.name": "Websocket đến",
+    "tracking_field.computercraft.websocket_outgoing.name": "Websocket đi",
+    "tracking_field.computercraft.coroutines_created.name": "Coroutine đã tạo",
+    "tracking_field.computercraft.coroutines_dead.name": "Coroutine bỏ đi",
+    "gui.computercraft.tooltip.copy": "Sao chép vào clipboard",
+    "gui.computercraft.tooltip.computer_id": "ID của máy tính: %s",
+    "gui.computercraft.tooltip.disk_id": "ID của đĩa: %s"
+}
diff --git a/src/main/resources/assets/computercraft/textures/gui/buttons.png b/src/main/resources/assets/computercraft/textures/gui/buttons.png
new file mode 100644
index 000000000..69ef550ee
Binary files /dev/null and b/src/main/resources/assets/computercraft/textures/gui/buttons.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png b/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png
index f4e8032a1..4da80a9bc 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png and b/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/corners_command.png b/src/main/resources/assets/computercraft/textures/gui/corners_command.png
index 1bd3c311a..0a96d54ff 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/corners_command.png and b/src/main/resources/assets/computercraft/textures/gui/corners_command.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/corners_normal.png b/src/main/resources/assets/computercraft/textures/gui/corners_normal.png
index 8b1e9f676..3627eaf3e 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/corners_normal.png and b/src/main/resources/assets/computercraft/textures/gui/corners_normal.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/disk_drive.png b/src/main/resources/assets/computercraft/textures/gui/disk_drive.png
index b4e5b9537..fc65203bf 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/disk_drive.png and b/src/main/resources/assets/computercraft/textures/gui/disk_drive.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/printer.png b/src/main/resources/assets/computercraft/textures/gui/printer.png
index c3dd9af0f..81ecfe272 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/printer.png and b/src/main/resources/assets/computercraft/textures/gui/printer.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/printout.png b/src/main/resources/assets/computercraft/textures/gui/printout.png
index 7ae1abd35..16ee7b353 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/printout.png and b/src/main/resources/assets/computercraft/textures/gui/printout.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/term_font.png b/src/main/resources/assets/computercraft/textures/gui/term_font.png
index 7bf23be2e..975fcc05b 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/term_font.png and b/src/main/resources/assets/computercraft/textures/gui/term_font.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png b/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png
index b746b0ad9..74a149a47 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png and b/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png differ
diff --git a/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png b/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png
index 4ac3eee08..83b6a882e 100644
Binary files a/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png and b/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png differ