diff --git a/README.md b/README.md index 0a6b4bf63..22d68e1ef 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,9 @@ This mod includes textures by [Jummit](https://github.com/Jummit) that are more CC: Restitched We also have a second resourcepack made by [3prm3](https://github.com/3prm3), it features a complete overhaul and can be enabled by enabling the `overhaul` resource pack, go check out his resource pack over [here](https://github.com/cc-orgs/cc-overhaul/tree/main)! ## Bleeding Edge Ver. -Bleeding edge builds can be found [here](https://github.com/cc-tweaked/cc-restitched/actions) at Github Actions. In the .zip file there should be a "-dev" jar, a "-javadoc" jar, a "-sources-dev" jar, a "-sources" jar, and a plain (jar without an affixed tag) jar. Put the plain jar in the mods folder. +Bleeding edge builds can be found [here](https://github.com/cc-tweaked/cc-restitched/actions) at Github Actions. +In the .zip file there should be a `-dev` jar, a `-javadoc` jar, a `-sources-dev` jar, a `-sources` jar, and a "plain" jar (jar without an affixed tag) jar. +Put the "plain" jar in the mods folder. ## Contributions Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping develop CC: R there are a few rules; diff --git a/doc/logo.png b/doc/logo.png index 33b71f8b6..c4c454daa 100644 Binary files a/doc/logo.png and b/doc/logo.png differ diff --git a/logo.png b/logo.png index 11a1ee256..2158f5a01 100644 Binary files a/logo.png and b/logo.png differ diff --git a/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java b/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java index a03820cc5..11791d4cf 100644 --- a/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java +++ b/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java @@ -111,7 +111,7 @@ public final class ComputerCraftAPI } /** - * rers a peripheral provider to convert blocks into {@link IPeripheral} implementations. + * Registers a peripheral provider to convert blocks into {@link IPeripheral} implementations. * * @param provider The peripheral provider to register. * @see IPeripheral diff --git a/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png index e53bda37f..d7a276016 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png and b/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/disk_drive_front_accepted.png b/src/main/resources/assets/computercraft/textures/block/disk_drive_front_accepted.png index 348654e7b..cabdf62a6 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/disk_drive_front_accepted.png and b/src/main/resources/assets/computercraft/textures/block/disk_drive_front_accepted.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_advanced.png b/src/main/resources/assets/computercraft/textures/block/turtle_advanced.png index 90a63842c..698abc269 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_advanced.png and b/src/main/resources/assets/computercraft/textures/block/turtle_advanced.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_colour.png b/src/main/resources/assets/computercraft/textures/block/turtle_colour.png index 2a65aab2a..f04fd4257 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_colour.png and b/src/main/resources/assets/computercraft/textures/block/turtle_colour.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/turtle_normal.png b/src/main/resources/assets/computercraft/textures/block/turtle_normal.png index ddf4a92e6..a2d1c117b 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/turtle_normal.png and b/src/main/resources/assets/computercraft/textures/block/turtle_normal.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png index 24ba52a78..e342f1b22 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png and b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png index b92d0f79f..8ccbe6aa5 100644 Binary files a/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.png and b/src/main/resources/assets/computercraft/textures/block/wireless_modem_advanced_face_on.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..51845fcca 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/turtle_advanced.png b/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png index b746b0ad9..81efb9dd9 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/item/printed_book.png b/src/main/resources/assets/computercraft/textures/item/printed_book.png index 4be66b368..cd82f6ff0 100644 Binary files a/src/main/resources/assets/computercraft/textures/item/printed_book.png and b/src/main/resources/assets/computercraft/textures/item/printed_book.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fa8bb6798..41a8330bb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,7 +17,8 @@ "parly", "Merith.TK", "Jummit", - "Toad-Dev" + "Toad-Dev", + "3prm3" ], "depends": { "minecraft": ">=1.18.2-rc.1 <1.19", diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front.png index d2db75c4f..ca31291e7 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front.png differ diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front_blink.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front_blink.png index f8942c64c..276e0343b 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front_blink.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front_blink.png differ diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front_on.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front_on.png index 3ac154897..888ab1ca8 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front_on.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/computer_normal_front_on.png differ diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/turtle_colour.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/turtle_colour.png index e4d8d3a10..be14c4666 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/turtle_colour.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/block/turtle_colour.png differ diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_colour.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_colour.png index 23507a186..c5f86e12b 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_colour.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/corners_colour.png differ diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/disk_drive.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/disk_drive.png index b4e5b9537..bbc51a50c 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/disk_drive.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/disk_drive.png differ diff --git a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/term_font.png b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/term_font.png index 7bf23be2e..58ee8fbbf 100644 Binary files a/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/term_font.png and b/src/main/resources/resourcepacks/classic/assets/computercraft/textures/gui/term_font.png differ