mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 20:20:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1349 from MCJack123/patch-14

Browse Source 
Fix introduction dates of os.cancel[Alarm|Timer]
This commit is contained in:
Jonathan Coates 2023-02-28 06:36:36 +00:00 committed by GitHub
commit 111f971ed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projects/core/src/main/java/dan200/computercraft/core/apis/OSAPI.java
View File

@ -167,6 +167,7 @@ public class OSAPI implements ILuaAPI {
* *
* @param token The ID of the timer to cancel. * @param token The ID of the timer to cancel.
* @see #startTimer To start a timer. * @see #startTimer To start a timer.
* @cc.since 1.6
*/ */
@LuaFunction @LuaFunction
public final void cancelTimer(int token) { public final void cancelTimer(int token) {
@ -201,7 +202,7 @@ public class OSAPI implements ILuaAPI {
* alarm from firing. * alarm from firing.
* *
* @param token The ID of the alarm to cancel. * @param token The ID of the alarm to cancel.
* @cc.since 1.2 * @cc.since 1.6
* @see #setAlarm To set an alarm. * @see #setAlarm To set an alarm.
*/ */
@LuaFunction @LuaFunction