diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/turtle/TurtleSide.java b/projects/common-api/src/main/java/dan200/computercraft/api/turtle/TurtleSide.java index b8aac57d5..66f36ec95 100644 --- a/projects/common-api/src/main/java/dan200/computercraft/api/turtle/TurtleSide.java +++ b/projects/common-api/src/main/java/dan200/computercraft/api/turtle/TurtleSide.java @@ -5,7 +5,7 @@ package dan200.computercraft.api.turtle; /** - * An enum representing the two sides of the turtle that a turtle turtle might reside. + * An enum representing the two sides of the turtle that a turtle upgrade might reside. */ public enum TurtleSide { /** diff --git a/projects/common/src/main/java/dan200/computercraft/shared/command/text/TableBuilder.java b/projects/common/src/main/java/dan200/computercraft/shared/command/text/TableBuilder.java index 2428e5637..dbf719d12 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/command/text/TableBuilder.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/command/text/TableBuilder.java @@ -63,7 +63,7 @@ public class TableBuilder { /** * Get the number of columns for this table. *

- * This will be the same as {@link #getHeaders()}'s length if it is is non-{@code null}, + * This will be the same as {@link #getHeaders()}'s length if it is non-{@code null}, * otherwise the length of the first column. * * @return The number of columns. diff --git a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java index 07db76314..e0f5e688b 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java @@ -110,7 +110,7 @@ public abstract class AbstractComputerBlockEntity extends BlockEntity implements fresh = false; computerID = computer.getID(); - // If the on state has changed, mark as as dirty. + // If the on state has changed, mark as dirty. var newOn = computer.isOn(); if (on != newOn) { on = newOn; diff --git a/projects/common/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java b/projects/common/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java index 885235d37..b1ad1af39 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java @@ -345,7 +345,7 @@ public class TurtleAPI implements ILuaAPI { * For instance, if a slot contains 13 blocks of dirt, it has room for another 51. * * @param slot The slot we wish to check. Defaults to the {@link #select selected slot}. - * @return The space left in in this slot. + * @return The space left in this slot. * @throws LuaException If the slot is out of range. */ @LuaFunction diff --git a/projects/core-api/src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java b/projects/core-api/src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java index 1a857d8d0..ca3123a61 100644 --- a/projects/core-api/src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java +++ b/projects/core-api/src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java @@ -38,7 +38,7 @@ public interface IPeripheral { } /** - * Is called when when a computer is attaching to the peripheral. + * Is called when a computer is attaching to the peripheral. *

* This will occur when a peripheral is placed next to an active computer, when a computer is turned on next to a * peripheral, when a turtle travels into a square next to a peripheral, or when a wired modem adjacent to this diff --git a/projects/core/src/main/java/dan200/computercraft/core/apis/OSAPI.java b/projects/core/src/main/java/dan200/computercraft/core/apis/OSAPI.java index c0d8b047d..e31f76d73 100644 --- a/projects/core/src/main/java/dan200/computercraft/core/apis/OSAPI.java +++ b/projects/core/src/main/java/dan200/computercraft/core/apis/OSAPI.java @@ -298,7 +298,7 @@ public class OSAPI implements ILuaAPI { * textutils.formatTime(os.time()) * } * @cc.since 1.2 - * @cc.changed 1.80pr1 Add support for getting the local local and UTC time. + * @cc.changed 1.80pr1 Add support for getting the local and UTC time. * @cc.changed 1.82.0 Arguments are now case insensitive. * @cc.changed 1.83.0 {@link #time(IArguments)} now accepts table arguments and converts them to UNIX timestamps. * @see #date To get a date table that can be converted with this function. diff --git a/projects/core/src/main/java/dan200/computercraft/core/apis/http/options/AddressPredicate.java b/projects/core/src/main/java/dan200/computercraft/core/apis/http/options/AddressPredicate.java index eb1d284ef..46bce96be 100644 --- a/projects/core/src/main/java/dan200/computercraft/core/apis/http/options/AddressPredicate.java +++ b/projects/core/src/main/java/dan200/computercraft/core/apis/http/options/AddressPredicate.java @@ -57,7 +57,7 @@ interface AddressPredicate { prefixSize = Integer.parseInt(prefixSizeStr); } catch (NumberFormatException e) { throw new InvalidRuleException(String.format( - "Invalid host host '%s': Cannot extract size of CIDR mask from '%s'.", + "Invalid host '%s': Cannot extract size of CIDR mask from '%s'.", addressStr + '/' + prefixSizeStr, prefixSizeStr )); } diff --git a/projects/core/src/main/java/dan200/computercraft/core/asm/Generator.java b/projects/core/src/main/java/dan200/computercraft/core/asm/Generator.java index 8124a54c4..3272b3bc2 100644 --- a/projects/core/src/main/java/dan200/computercraft/core/asm/Generator.java +++ b/projects/core/src/main/java/dan200/computercraft/core/asm/Generator.java @@ -270,7 +270,7 @@ final class Generator { } // Fold over the original method's arguments, excluding the target in reverse. For each argument, we reduce - // a method of type type (target, args..., arg_n, context..., IArguments) -> _ to (target, args..., context..., IArguments) -> _ + // a method of type (target, args..., arg_n, context..., IArguments) -> _ to (target, args..., context..., IArguments) -> _ // until eventually we've flattened the whole list. for (var i = parameterTypes.size() - 1; i >= 0; i--) { handle = MethodHandles.foldArguments(handle, i + 1, argSelectors.get(i)); diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md b/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md index 3342468a4..c15e79772 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md @@ -800,7 +800,7 @@ And several bug fixes: # New features in CC: Tweaked 1.86.2 * Fix peripheral.getMethods returning an empty table. -* Update to Minecraft 1.15.2. This is currently alpha-quality and so is missing missing features and may be unstable. +* Update to Minecraft 1.15.2. This is currently alpha-quality and so is missing features and may be unstable. # New features in CC: Tweaked 1.86.1 @@ -1416,7 +1416,7 @@ And several bug fixes: * Turtles can now compare items in their inventories * Turtles can place signs with text on them with `turtle.place( [signText] )` * Turtles now optionally require fuel items to move, and can refuel themselves -* The size of the the turtle inventory has been increased to 16 +* The size of the turtle inventory has been increased to 16 * The size of the turtle screen has been increased * New turtle functions: `turtle.compareTo( [slotNum] )`, `turtle.craft()`, `turtle.attack()`, `turtle.attackUp()`, `turtle.attackDown()`, `turtle.dropUp()`, `turtle.dropDown()`, `turtle.getFuelLevel()`, `turtle.refuel()` * New disk function: disk.getID() diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/audio/dfpwm.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/audio/dfpwm.lua index 5b5e05244..0161c6b09 100644 --- a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/audio/dfpwm.lua +++ b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/audio/dfpwm.lua @@ -211,7 +211,7 @@ end --[[- A convenience function for encoding a complete file of audio at once. -This should only be used for complete pieces of audio. If you are writing writing multiple chunks to the same place, +This should only be used for complete pieces of audio. If you are writing multiple chunks to the same place, you should use an encoder returned by [`make_encoder`] instead. @tparam { number... } input The table of amplitude data. diff --git a/projects/core/src/test/resources/test-rom/spec/modules/cc/internal/syntax/lexer_spec.md b/projects/core/src/test/resources/test-rom/spec/modules/cc/internal/syntax/lexer_spec.md index c6e983566..8cb2e646f 100644 --- a/projects/core/src/test/resources/test-rom/spec/modules/cc/internal/syntax/lexer_spec.md +++ b/projects/core/src/test/resources/test-rom/spec/modules/cc/internal/syntax/lexer_spec.md @@ -13,13 +13,13 @@ correct tokens and positions, and that it can report sensible error messages. We can lex some basic comments: ```lua --- A basic singleline comment comment +-- A basic singleline comment --[ Not a multiline comment --[= Also not a multiline comment! ``` ```txt -1:1-1:37 COMMENT -- A basic singleline comment comment +1:1-1:37 COMMENT -- A basic singleline comment 2:1-2:27 COMMENT --[ Not a multiline comment 3:1-3:34 COMMENT --[= Also not a multiline comment! ```