Let's make this a proper release

Minecraft propagates "strong" redstone signals (such as those directly
from comparators or repeaters) through solid blocks. This includes
computers, which is a little annoying as it means one cannot feed
redstone wire from one side and a repeater from another.

This changes computers to not propagate strong redstone signals, in the
same way transparent blocks like glass do.

Closes #548.

README.md

@@ -50,12 +50,12 @@ I'd generally recommend you don't contact me directly (email, DM, etc...) unless
 report exploits). You'll get a far quicker response if you ask the whole community!
 
 ## Using
-If you want to depend on CC: Tweaked, we have a maven repo. However, you should be wary that some functionality is only
-exposed by CC:T's API and not vanilla ComputerCraft. If you wish to support all variations of ComputerCraft, I recommend
-using [cc.crzd.me's maven](https://cc.crzd.me/maven/) instead.
+CC: Tweaked is hosted on my maven repo, and so is relatively simple to depend on. You may wish to add a soft (or hard)
+dependency in your `mods.toml` file, with the appropriate version bounds, to ensure that API functionality you depend
+on is present.
 
 ```groovy
-dependencies {
+repositories {
   maven { url 'https://squiddev.cc/maven/' }
 }
 

build.gradle

@@ -409,7 +409,7 @@ curseforge {
     apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
     project {
         id = '282001'
-        releaseType = 'alpha'
+        releaseType = 'release'
         changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
 
         relations {
@@ -487,7 +487,7 @@ githubRelease {
             .takeWhile { it != 'Type "help changelog" to see the full version history.' }
             .join("\n").trim()
     }
-    prerelease true
+    prerelease false
 }
 
 def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]

gradle.properties

@@ -1,7 +1,7 @@
 # Mod properties
-mod_version=1.91.1
+mod_version=1.93.0
 
 # Minecraft properties (update mods.toml when changing)
-mc_version=1.16.2
-forge_version=33.0.37
+mc_version=1.16.3
+forge_version=34.0.1
 mappings_version=20200723-1.16.1

src/main/java/dan200/computercraft/ComputerCraft.java

@@ -39,6 +39,7 @@ public final class ComputerCraft
     public static final String[] DEFAULT_HTTP_ALLOW = new String[] { "*" };
     public static final String[] DEFAULT_HTTP_DENY = new String[] {
         "127.0.0.0/8",
+        "0.0.0.0/8",
         "10.0.0.0/8",
         "172.16.0.0/12",
         "192.168.0.0/16",
@@ -62,10 +63,10 @@ public final class ComputerCraft
     public static boolean httpWebsocketEnabled = true;
     public static List<AddressRule> httpRules = Collections.unmodifiableList( Stream.concat(
         Stream.of( DEFAULT_HTTP_DENY )
-            .map( x -> AddressRule.parse( x, Action.DENY.toPartial() ) )
+            .map( x -> AddressRule.parse( x, null, Action.DENY.toPartial() ) )
             .filter( Objects::nonNull ),
         Stream.of( DEFAULT_HTTP_ALLOW )
-            .map( x -> AddressRule.parse( x, Action.ALLOW.toPartial() ) )
+            .map( x -> AddressRule.parse( x, null, Action.ALLOW.toPartial() ) )
             .filter( Objects::nonNull )
     ).collect( Collectors.toList() ) );
 

src/main/java/dan200/computercraft/core/apis/http/CheckUrl.java

@@ -24,14 +24,14 @@ public class CheckUrl extends Resource<CheckUrl>
 
     private final IAPIEnvironment environment;
     private final String address;
-    private final String host;
+    private final URI uri;
 
     public CheckUrl( ResourceGroup<CheckUrl> limiter, IAPIEnvironment environment, String address, URI uri )
     {
         super( limiter );
         this.environment = environment;
         this.address = address;
-        host = uri.getHost();
+        this.uri = uri;
     }
 
     public void run()
@@ -47,8 +47,9 @@ public class CheckUrl extends Resource<CheckUrl>
 
         try
         {
-            InetSocketAddress netAddress = NetworkUtils.getAddress( host, 80, false );
-            NetworkUtils.getOptions( host, netAddress );
+            boolean ssl = uri.getScheme().equalsIgnoreCase( "https" );
+            InetSocketAddress netAddress = NetworkUtils.getAddress( uri, ssl );
+            NetworkUtils.getOptions( uri.getHost(), netAddress );
 
             if( tryClose() ) environment.queueEvent( EVENT, address, true );
         }

src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java

@@ -19,6 +19,7 @@ import io.netty.handler.ssl.SslContextBuilder;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.TrustManagerFactory;
 import java.net.InetSocketAddress;
+import java.net.URI;
 import java.security.KeyStore;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.SynchronousQueue;
@@ -99,6 +100,21 @@ public final class NetworkUtils
         }
     }
 
+    /**
+     * Create a {@link InetSocketAddress} from a {@link java.net.URI}.
+     *
+     * Note, this may require a DNS lookup, and so should not be executed on the main CC thread.
+     *
+     * @param uri The URI to fetch.
+     * @param ssl Whether to connect with SSL. This is used to find the default port if not otherwise specified.
+     * @return The resolved address.
+     * @throws HTTPRequestException If the host is not malformed.
+     */
+    public static InetSocketAddress getAddress( URI uri, boolean ssl ) throws HTTPRequestException
+    {
+        return getAddress( uri.getHost(), uri.getPort(), ssl );
+    }
+
     /**
      * Create a {@link InetSocketAddress} from the resolved {@code host} and port.
      *
@@ -128,7 +144,7 @@ public final class NetworkUtils
      */
     public static Options getOptions( String host, InetSocketAddress address ) throws HTTPRequestException
     {
-        Options options = AddressRule.apply( ComputerCraft.httpRules, host, address.getAddress() );
+        Options options = AddressRule.apply( ComputerCraft.httpRules, host, address );
         if( options.action == Action.DENY ) throw new HTTPRequestException( "Domain not permitted" );
         return options;
     }

src/main/java/dan200/computercraft/core/apis/http/options/AddressRule.java

@@ -12,6 +12,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.net.Inet6Address;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.regex.Pattern;
 
 /**
@@ -52,17 +53,23 @@ public final class AddressRule
 
     private final HostRange ip;
     private final Pattern domainPattern;
+    private final Integer port;
     private final PartialOptions partial;
 
-    private AddressRule( @Nullable HostRange ip, @Nullable Pattern domainPattern, @Nonnull PartialOptions partial )
+    private AddressRule(
+        @Nullable HostRange ip,
+        @Nullable Pattern domainPattern,
+        @Nullable Integer port,
+        @Nonnull PartialOptions partial )
     {
         this.ip = ip;
         this.domainPattern = domainPattern;
         this.partial = partial;
+        this.port = port;
     }
 
     @Nullable
-    public static AddressRule parse( String filter, @Nonnull PartialOptions partial )
+    public static AddressRule parse( String filter, @Nullable Integer port, @Nonnull PartialOptions partial )
     {
         int cidr = filter.indexOf( '/' );
         if( cidr >= 0 )
@@ -117,24 +124,27 @@ public final class AddressRule
                 size -= 8;
             }
 
-            return new AddressRule( new HostRange( minBytes, maxBytes ), null, partial );
+            return new AddressRule( new HostRange( minBytes, maxBytes ), null, port, partial );
         }
         else
         {
             Pattern pattern = Pattern.compile( "^\\Q" + filter.replaceAll( "\\*", "\\\\E.*\\\\Q" ) + "\\E$" );
-            return new AddressRule( null, pattern, partial );
+            return new AddressRule( null, pattern, port, partial );
         }
     }
 
     /**
      * Determine whether the given address matches a series of patterns.
      *
-     * @param domain  The domain to match
-     * @param address The address to check.
+     * @param domain        The domain to match
+     * @param socketAddress The address to check.
      * @return Whether it matches any of these patterns.
      */
-    private boolean matches( String domain, InetAddress address )
+    private boolean matches( String domain, InetSocketAddress socketAddress )
     {
+        InetAddress address = socketAddress.getAddress();
+        if( port != null && port != socketAddress.getPort() ) return false;
+
         if( domainPattern != null )
         {
             if( domainPattern.matcher( domain ).matches() ) return true;
@@ -155,7 +165,7 @@ public final class AddressRule
         return ip != null && ip.contains( address );
     }
 
-    public static Options apply( Iterable<? extends AddressRule> rules, String domain, InetAddress address )
+    public static Options apply( Iterable<? extends AddressRule> rules, String domain, InetSocketAddress address )
     {
         PartialOptions options = null;
         boolean hasMany = false;

src/main/java/dan200/computercraft/core/apis/http/options/AddressRuleConfig.java

@@ -49,12 +49,14 @@ public class AddressRuleConfig
     public static boolean checkRule( UnmodifiableConfig builder )
     {
         String hostObj = get( builder, "host", String.class ).orElse( null );
+        Integer port = get( builder, "port", Number.class ).map( Number::intValue ).orElse( null );
         return hostObj != null && checkEnum( builder, "action", Action.class )
+            && check( builder, "port", Number.class )
             && check( builder, "timeout", Number.class )
             && check( builder, "max_upload", Number.class )
             && check( builder, "max_download", Number.class )
             && check( builder, "websocket_message", Number.class )
-            && AddressRule.parse( hostObj, PartialOptions.DEFAULT ) != null;
+            && AddressRule.parse( hostObj, port, PartialOptions.DEFAULT ) != null;
     }
 
     @Nullable
@@ -64,6 +66,7 @@ public class AddressRuleConfig
         if( hostObj == null ) return null;
 
         Action action = getEnum( builder, "action", Action.class ).orElse( null );
+        Integer port = get( builder, "port", Number.class ).map( Number::intValue ).orElse( null );
         Integer timeout = get( builder, "timeout", Number.class ).map( Number::intValue ).orElse( null );
         Long maxUpload = get( builder, "max_upload", Number.class ).map( Number::longValue ).orElse( null );
         Long maxDownload = get( builder, "max_download", Number.class ).map( Number::longValue ).orElse( null );
@@ -77,7 +80,7 @@ public class AddressRuleConfig
             websocketMessage
         );
 
-        return AddressRule.parse( hostObj, options );
+        return AddressRule.parse( hostObj, port, options );
     }
 
     private static <T> boolean check( UnmodifiableConfig config, String field, Class<T> klass )

src/main/java/dan200/computercraft/core/apis/http/request/HttpRequest.java

@@ -136,7 +136,7 @@ public class HttpRequest extends Resource<HttpRequest>
         try
         {
             boolean ssl = uri.getScheme().equalsIgnoreCase( "https" );
-            InetSocketAddress socketAddress = NetworkUtils.getAddress( uri.getHost(), uri.getPort(), ssl );
+            InetSocketAddress socketAddress = NetworkUtils.getAddress( uri, ssl );
             Options options = NetworkUtils.getOptions( uri.getHost(), socketAddress );
             SslContext sslContext = ssl ? NetworkUtils.getSslContext() : null;
 

src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java

@@ -129,8 +129,7 @@ public class Websocket extends Resource<Websocket>
         try
         {
             boolean ssl = uri.getScheme().equalsIgnoreCase( "wss" );
-
-            InetSocketAddress socketAddress = NetworkUtils.getAddress( uri.getHost(), uri.getPort(), ssl );
+            InetSocketAddress socketAddress = NetworkUtils.getAddress( uri, ssl );
             Options options = NetworkUtils.getOptions( uri.getHost(), socketAddress );
             SslContext sslContext = ssl ? NetworkUtils.getSslContext() : null;
 

src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java

@@ -124,7 +124,7 @@ public class FileSystemWrapperMount implements IFileSystem
     {
         try
         {
-            return m_filesystem.exists( path );
+            return m_filesystem.isDir( path );
         }
         catch( FileSystemException e )
         {

src/main/java/dan200/computercraft/data/Generators.java

@@ -7,7 +7,6 @@
 package dan200.computercraft.data;
 
 import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
-import net.minecraft.data.BlockTagsProvider;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -24,6 +23,6 @@ public class Generators
         DataGenerator generator = event.getGenerator();
         generator.addProvider( new Recipes( generator ) );
         generator.addProvider( new LootTables( generator ) );
-        generator.addProvider( new Tags( generator, new BlockTagsProvider( generator ) ) );
+        generator.addProvider( new Tags( generator, event.getExistingFileHelper() ) );
     }
 }

src/main/java/dan200/computercraft/data/Tags.java

@@ -15,6 +15,7 @@ import net.minecraft.item.Item;
 import net.minecraft.tags.ITag;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.common.data.ExistingFileHelper;
 
 import static dan200.computercraft.data.Tags.CCTags.*;
 
@@ -30,9 +31,9 @@ public class Tags extends ItemTagsProvider
         public static final ITag.INamedTag<Item> MONITOR = item( "monitor" );
     }
 
-    public Tags( DataGenerator generator, BlockTagsProvider tags )
+    public Tags( DataGenerator generator, ExistingFileHelper helper )
     {
-        super( generator, tags );
+        super( generator, new BlockTagsProvider( generator, ComputerCraft.MOD_ID, helper ), ComputerCraft.MOD_ID, helper );
     }
 
     @Override

src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java

@@ -27,6 +27,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.IBlockReader;
+import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.fml.RegistryObject;
@@ -182,4 +183,10 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
             if( label != null ) computer.setLabel( label );
         }
     }
+
+    @Override
+    public boolean shouldCheckWeakPower( BlockState state, IWorldReader world, BlockPos pos, Direction side )
+    {
+        return false;
+    }
 }

src/main/java/dan200/computercraft/shared/peripheral/printer/ContainerPrinter.java

@@ -13,7 +13,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.inventory.container.Container;
 import net.minecraft.inventory.container.Slot;
-import net.minecraft.item.DyeItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIntArray;
 import net.minecraft.util.IntArray;
@@ -95,7 +94,7 @@ public class ContainerPrinter extends Container
         else
         {
             // Transfer from inventory to printer
-            if( stack.getItem() instanceof DyeItem )
+            if( TilePrinter.isInk( stack ) )
             {
                 if( !mergeItemStack( stack, 0, 1, false ) ) return ItemStack.EMPTY;
             }

src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java

@@ -300,9 +300,9 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
         }
     }
 
-    private static boolean isInk( @Nonnull ItemStack stack )
+    static boolean isInk( @Nonnull ItemStack stack )
     {
-        return stack.getItem() instanceof DyeItem;
+        return ColourUtils.getStackColour( stack ) != null;
     }
 
     private static boolean isPaper( @Nonnull ItemStack stack )
@@ -321,7 +321,8 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
     private boolean inputPage()
     {
         ItemStack inkStack = m_inventory.get( 0 );
-        if( !isInk( inkStack ) ) return false;
+        DyeColor dye = ColourUtils.getStackColour( inkStack );
+        if( dye == null ) return false;
 
         for( int i = 1; i < 7; i++ )
         {
@@ -329,8 +330,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
             if( paperStack.isEmpty() || !isPaper( paperStack ) ) continue;
 
             // Setup the new page
-            DyeColor dye = ColourUtils.getStackColour( inkStack );
-            m_page.setTextColour( dye != null ? dye.getId() : 15 );
+            m_page.setTextColour( dye.getId() );
 
             m_page.clear();
             if( paperStack.getItem() instanceof ItemPrintout )

src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java

@@ -55,11 +55,10 @@ public final class TurtlePlayer extends FakePlayer
 
     private void setState( ITurtleAccess turtle )
     {
-        if( openContainer != null )
+        if( openContainer != container )
         {
             ComputerCraft.log.warn( "Turtle has open container ({})", openContainer );
-            openContainer.onContainerClosed( this );
-            openContainer = null;
+            closeContainer();
         }
 
         BlockPos position = turtle.getPosition();

src/main/java/dan200/computercraft/shared/util/ColourUtils.java

@@ -40,6 +40,8 @@ public final class ColourUtils
 
     public static DyeColor getStackColour( ItemStack stack )
     {
+        if( stack.isEmpty() ) return null;
+
         for( int i = 0; i < DYES.length; i++ )
         {
             ITag<Item> dye = DYES[i];

src/main/java/dan200/computercraft/shared/util/DropConsumer.java

@@ -42,8 +42,6 @@ public final class DropConsumer
         dropEntity = entity;
         dropWorld = entity.world;
         dropBounds = new AxisAlignedBB( entity.getPosition() ).grow( 2, 2, 2 );
-
-        entity.captureDrops( new ArrayList<>() );
     }
 
     public static void set( World world, BlockPos pos, Function<ItemStack, ItemStack> consumer )
@@ -86,7 +84,7 @@ public final class DropConsumer
         }
     }
 
-    @SubscribeEvent
+    @SubscribeEvent( priority = EventPriority.LOW )
     public static void onLivingDrops( LivingDropsEvent drops )
     {
         if( dropEntity == null || drops.getEntity() != dropEntity ) return;

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[33,34)"
+loaderVersion="[34,35)"
 
 issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues"
 displayURL="https://github.com/SquidDev-CC/CC-Tweaked"
@@ -20,6 +20,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
 [[dependencies.computercraft]]
     modId="forge"
     mandatory=true
-    versionRange="[33.0.20,34)"
+    versionRange="[34.0.1,35)"
     ordering="NONE"
     side="BOTH"

src/main/resources/assets/computercraft/lang/sv_se.json

@@ -1,14 +1,14 @@
 {
     "block.computercraft.computer_normal": "Dator",
     "block.computercraft.computer_advanced": "Avancerad Dator",
-    "block.computercraft.computer_command": "Kommando Dator",
+    "block.computercraft.computer_command": "Kommandodator",
     "block.computercraft.disk_drive": "Diskettläsare",
     "block.computercraft.printer": "Skrivare",
     "block.computercraft.speaker": "Högtalare",
     "block.computercraft.monitor_normal": "Skärm",
     "block.computercraft.monitor_advanced": "Avancerad Skärm",
     "block.computercraft.wireless_modem_normal": "Trådlöst Modem",
-    "block.computercraft.wireless_modem_advanced": "Ender Modem",
+    "block.computercraft.wireless_modem_advanced": "Endermodem",
     "block.computercraft.wired_modem": "Trådat Modem",
     "block.computercraft.cable": "Nätverkskabel",
     "block.computercraft.wired_modem_full": "Trådat Modem",
@@ -38,5 +38,76 @@
     "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.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"
 }

src/main/resources/assets/computercraft/lang/vi.json

@@ -0,0 +1,48 @@
+{
+    "gui.computercraft.tooltip.disk_id": "ID của đĩa: %s",
+    "upgrade.computercraft.speaker.adjective": "Ồn ào",
+    "upgrade.computercraft.wireless_modem_advanced.adjective": "Ender",
+    "upgrade.computercraft.wireless_modem_normal.adjective": "Không dây",
+    "upgrade.minecraft.crafting_table.adjective": "Chế tạo",
+    "upgrade.minecraft.diamond_hoe.adjective": "Trồng trọt",
+    "upgrade.minecraft.diamond_axe.adjective": "Đốn",
+    "upgrade.minecraft.diamond_pickaxe.adjective": "Khai thác",
+    "upgrade.minecraft.diamond_shovel.adjective": "Đào",
+    "item.computercraft.pocket_computer_advanced.upgraded": "Máy tính bỏ túi tiên tiến %s",
+    "item.computercraft.pocket_computer_advanced": "Máy tính bỏ túi tiên tiến",
+    "item.computercraft.pocket_computer_normal.upgraded": "Máy tính bỏ túi %s",
+    "item.computercraft.pocket_computer_normal": "Máy tính bỏ túi",
+    "item.computercraft.printed_book": "Sách in",
+    "item.computercraft.printed_page": "Trang in",
+    "item.computercraft.treasure_disk": "Đĩa mềm",
+    "item.computercraft.disk": "Đĩa mềm",
+    "block.computercraft.turtle_advanced.upgraded_twice": "Rùa tiên tiến %s %s",
+    "block.computercraft.turtle_advanced.upgraded": "Rùa tiên tiến %s",
+    "block.computercraft.turtle_advanced": "Rùa tiên tiến",
+    "block.computercraft.turtle_normal.upgraded_twice": "Rùa %s %s",
+    "block.computercraft.turtle_normal.upgraded": "Rùa %s",
+    "block.computercraft.turtle_normal": "Rùa",
+    "block.computercraft.wired_modem_full": "Modem có dây",
+    "block.computercraft.cable": "Dây cáp mạng",
+    "block.computercraft.wired_modem": "Modem có dây",
+    "block.computercraft.wireless_modem_advanced": "Modem Ender",
+    "block.computercraft.wireless_modem_normal": "Modem không dây",
+    "block.computercraft.monitor_advanced": "Màn hình tiên tiếng",
+    "block.computercraft.monitor_normal": "Màn hình",
+    "block.computercraft.speaker": "Loa",
+    "block.computercraft.printer": "Máy in",
+    "block.computercraft.disk_drive": "Ỗ đĩa",
+    "block.computercraft.computer_command": "Máy tính điều khiển",
+    "block.computercraft.computer_normal": "Máy tính",
+    "itemGroup.computercraft": "ComputerCraft",
+    "block.computercraft.computer_advanced": "Máy tính tiên tiến",
+    "tracking_field.computercraft.websocket_incoming.name": "Websocket đến",
+    "tracking_field.computercraft.websocket_outgoing.name": "Websocket đi",
+    "gui.computercraft.tooltip.computer_id": "ID của máy tính: %s",
+    "tracking_field.computercraft.coroutines_dead.name": "Coroutine bỏ đi",
+    "tracking_field.computercraft.coroutines_created.name": "Coroutine đã tạo",
+    "tracking_field.computercraft.http_download.name": "HTTP tải xuống",
+    "tracking_field.computercraft.http_upload.name": "HTTP tải lên",
+    "tracking_field.computercraft.http.name": "Yêu cầu HTTP",
+    "gui.computercraft.tooltip.copy": "Sao chép vào clipboard"
+}

src/main/resources/data/computercraft/lua/rom/apis/io.lua

@@ -289,7 +289,7 @@ end
 -- The `mode` string can be any of the following:
 --  - **"r"**: Read mode
 --  - **"w"**: Write mode
---  - **"w"**: Append mode
+--  - **"a"**: Append mode
 --
 -- The mode may also have a `b` at the end, which opens the file in "binary
 -- mode". This allows you to read binary files, as well as seek within a file.

src/main/resources/data/computercraft/lua/rom/apis/textutils.lua

@@ -432,7 +432,7 @@ do
 
     --- Skip any whitespace
     local function skip(str, pos)
-        local _, last = find(str, "^[ \n\r\v]+", pos)
+        local _, last = find(str, "^[ \n\r\t]+", pos)
         if last then return last + 1 else return pos end
     end
 
@@ -472,7 +472,7 @@ do
                     buf[n], n, pos = utf8.char(tonumber(num_str, 16)), n + 1, pos + 6
                 else
                     local unesc = escapes[c]
-                    if not unesc then error_at(pos + 1, "Unknown escape character %q.", unesc) end
+                    if not unesc then error_at(pos + 1, "Unknown escape character %q.", c) end
                     buf[n], n, pos = unesc, n + 1, pos + 2
                 end
             elseif c >= '\x20' then

src/main/resources/data/computercraft/lua/rom/apis/window.lua

@@ -440,7 +440,7 @@ function create(parent, nX, nY, nWidth, nHeight, bStartVisible)
     end
 
     --- Get the buffered contents of a line in this window.
-    ---
+    --
     -- @tparam number y The y position of the line to get.
     -- @treturn string The textual content of this line.
     -- @treturn string The text colours of this line, suitable for use with @{term.blit}.

src/main/resources/data/computercraft/lua/rom/help/changelog.txt

@@ -1,3 +1,24 @@
+# New features in CC: Tweaked 1.93.0
+
+* Update Swedish translations (Granddave).
+* Printers use item tags to check dyes.
+* HTTP rules may now be targetted for a specific port.
+* Don't propagate adjacent redstone signals through computers.
+
+And several bug fixes:
+* Fix NPEs when turtles interact with containers.
+
+# New features in CC: Tweaked 1.92.0
+
+* Bump Cobalt version:
+  * Add support for the __pairs metamethod.
+  * string.format now uses the __tostring metamethod.
+* Add date-specific MOTDs (MCJack123).
+
+And several bug fixes:
+* Correctly handle tabs within textutils.unserailizeJSON.
+* Fix sheep not dropping items when sheared by turtles.
+
 # New features in CC: Tweaked 1.91.1
 
 * Fix crash when turtles interact with an entity.

src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt

@@ -1,5 +1,11 @@
-New features in CC: Tweaked 1.91.1
+New features in CC: Tweaked 1.93.0
 
-* Fix crash when turtles interact with an entity.
+* Update Swedish translations (Granddave).
+* Printers use item tags to check dyes.
+* HTTP rules may now be targetted for a specific port.
+* Don't propagate adjacent redstone signals through computers.
+
+And several bug fixes:
+* Fix NPEs when turtles interact with containers.
 
 Type "help changelog" to see the full version history.

src/main/resources/data/computercraft/lua/rom/programs/motd.lua

@@ -1,15 +1,24 @@
-local tMotd = {}
+local date = os.date("*t")
+if date.month == 1 and date.day == 1 then
+    print("Happy new year!")
+elseif date.month == 12 and date.day == 24 then
+    print("Merry X-mas!")
+elseif date.month == 10 and date.day == 31 then
+    print("OOoooOOOoooo! Spooky!")
+else
+    local tMotd = {}
 
-for sPath in string.gmatch(settings.get("motd.path"), "[^:]+") do
-    if fs.exists(sPath) then
-        for sLine in io.lines(sPath) do
-            table.insert(tMotd, sLine)
+    for sPath in string.gmatch(settings.get("motd.path"), "[^:]+") do
+        if fs.exists(sPath) then
+            for sLine in io.lines(sPath) do
+                table.insert(tMotd, sLine)
+            end
         end
     end
-end
 
-if #tMotd == 0 then
-    print("missingno")
-else
-    print(tMotd[math.random(1, #tMotd)])
+    if #tMotd == 0 then
+        print("missingno")
+    else
+        print(tMotd[math.random(1, #tMotd)])
+    end
 end

src/test/java/dan200/computercraft/core/apis/http/options/AddressRuleTest.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.core.apis.http.options;
+
+import org.junit.jupiter.api.Test;
+
+import java.net.InetSocketAddress;
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class AddressRuleTest
+{
+    @Test
+    public void matchesPort()
+    {
+        Iterable<AddressRule> rules = Collections.singletonList( AddressRule.parse(
+            "127.0.0.1", 8080,
+            new PartialOptions( Action.ALLOW, null, null, null, null )
+        ) );
+
+        assertEquals( apply( rules, "localhost", 8080 ).action, Action.ALLOW );
+        assertEquals( apply( rules, "localhost", 8081 ).action, Action.DENY );
+    }
+
+    private Options apply( Iterable<AddressRule> rules, String host, int port )
+    {
+        return AddressRule.apply( rules, host, new InetSocketAddress( host, port ) );
+    }
+}

src/test/resources/test-rom/data/json-parsing/y_tab_whitespace.json

@@ -0,0 +1 @@
+[	]

src/test/resources/test-rom/spec/programs/motd_spec.lua

@@ -1,14 +1,36 @@
 local capture = require "test_helpers".capture_program
 
 describe("The motd program", function()
+    local function setup_date(month, day)
+        stub(os, "date", function() return { month = month, day = day } end)
+    end
 
-    it("displays MODT", function()
-        local file = fs.open("/modt_check.txt", "w")
+    it("displays MOTD", function()
+        setup_date(0, 0)
+        local file = fs.open("/motd_check.txt", "w")
         file.write("Hello World!")
         file.close()
-        settings.set("motd.path", "/modt_check.txt")
+        settings.set("motd.path", "/motd_check.txt")
 
         expect(capture(stub, "motd"))
             :matches { ok = true, output = "Hello World!\n", error = "" }
     end)
+
+    it("displays date-specific MOTD (1/1)", function()
+        setup_date(1, 1)
+        expect(capture(stub, "motd"))
+            :matches { ok = true, output = "Happy new year!\n", error = "" }
+    end)
+
+    it("displays date-specific MOTD (10/31)", function()
+        setup_date(10, 31)
+        expect(capture(stub, "motd"))
+            :matches { ok = true, output = "OOoooOOOoooo! Spooky!\n", error = "" }
+    end)
+
+    it("displays date-specific MOTD (12/24)", function()
+        setup_date(12, 24)
+        expect(capture(stub, "motd"))
+            :matches { ok = true, output = "Merry X-mas!\n", error = "" }
+    end)
 end)