From a2cde54a69ddbcdf9647e43e07dc354fdf2ae798 Mon Sep 17 00:00:00 2001 From: mint Date: Sun, 21 Nov 2021 16:58:36 +0000 Subject: [PATCH 1/5] grammar fixes --- rhythmblock.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rhythmblock.lua b/rhythmblock.lua index b4da018..78b3736 100644 --- a/rhythmblock.lua +++ b/rhythmblock.lua @@ -14,7 +14,7 @@ centerWidth = round(width / 2) -- Defines the horizontal center centerHeight = round(height / 2) -- Defines the vertical center if arg[1] == nil then - peripherals = peripheral.getNames() -- Gets peripherals to check if any disk drives are avavailable + peripherals = peripheral.getNames() -- Gets peripherals to check if any disk drives are available if #peripherals == 0 then term.setTextColor(colors.red) print("No drive") @@ -30,7 +30,7 @@ if arg[1] == nil then end if driveCount > 1 then term.setTextColor(colors.red) - print("Too many disk drives. Specify where the desired disk drive is by running 'rhythmblock [drive position]'") -- For safety reasons + print("Too many disk drives. Specify where the desired disk drive is located by running 'rhythmblock [drive position]'") -- For safety reasons return false elseif driveCount == 0 then term.setTextColor(colors.red) @@ -42,7 +42,7 @@ else drive = arg[1] end ---[[ Instead of calling every status by string, we call the variables storing the strings. This may ease translation if we plan to do it in the future. +--[[ Instead of calling every status by string, we call the variables storing the strings. This may ease translation if we plan to do so in the future. ]] defaultStatus = "Rhythmblock" @@ -142,7 +142,7 @@ status = defaultStatus -- Setting the value to the default while true do statusRender(status) -- Renders the status - if term.isColour() then -- Renders the close button (if the song title is too long, the close button kind of disappears + if term.isColour() then -- Renders the close button (if the song title is too long, the close button kind of disappears) renderCloseButton() end local eventData = {os.pullEvent()} From aa92f10c6c1e0a9066b0b1da0804092702eb86f0 Mon Sep 17 00:00:00 2001 From: mint Date: Sun, 21 Nov 2021 17:06:15 +0000 Subject: [PATCH 2/5] added GPLv3 message --- rhythmblock.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/rhythmblock.lua b/rhythmblock.lua index 78b3736..0efc5d5 100644 --- a/rhythmblock.lua +++ b/rhythmblock.lua @@ -1,3 +1,19 @@ +-- Rhythmblock - music player for CC: Tweaked +-- (c) 2021 mint +-- +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + -- Change these lines to change the GUI colors. accentColor = colors.gray buttonColor = colors.lightGray From 06c139fe166964688f38deee6c90764151252345 Mon Sep 17 00:00:00 2001 From: mint Date: Sun, 21 Nov 2021 17:09:19 +0000 Subject: [PATCH 3/5] modified license notice --- rhythmblock.lua | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/rhythmblock.lua b/rhythmblock.lua index 0efc5d5..29d1e5f 100644 --- a/rhythmblock.lua +++ b/rhythmblock.lua @@ -1,18 +1,22 @@ --- Rhythmblock - music player for CC: Tweaked --- (c) 2021 mint --- --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . +--[[ + + Rhythmblock - a graphical music player for CC: Tweaked + (c) 2021 mint + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +--]] -- Change these lines to change the GUI colors. accentColor = colors.gray From a9a2972cbfa8cfcb68770a5db92cc03b3d0cba71 Mon Sep 17 00:00:00 2001 From: mint Date: Sun, 21 Nov 2021 17:09:56 +0000 Subject: [PATCH 4/5] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b1dc28d..e9e1bce 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![Rhythmblock](logo.png) # Rhythmblock -a graphical, customizable music player for ComputerCraft +a graphical, customizable music player for CC: Tweaked ![Rhythmblock playing Cat by C418](screenshot.png) From a09caf2b34194e730cd81de729ca74520aab191a Mon Sep 17 00:00:00 2001 From: mint Date: Sun, 21 Nov 2021 17:10:10 +0000 Subject: [PATCH 5/5] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9e1bce..677f05c 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,6 @@ q - quit ## Install -run the following on the desired CC computer +run the following command on the desired CC computer `wget https://fem.mint.lgbt/m/Rhythmblock/raw/branch/master/rhythmblock.lua Rhythmblock`