mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-06 04:17:56 +00:00
Code Issues Releases Wiki Activity

Fix epoch documentation to use milliseconds (#580)

Browse Source
This commit is contained in:
Merith-TK
2021-04-09 20:45:59 -07:00
parent 9b77a4aaee
commit 624b23c7ac
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patchwork.md
View File

@@ -305,9 +305,16 @@ little more detail.
[1] https://github.com/SquidDev-CC/CC-Tweaked/wiki/Monitor-texture-reference [1] https://github.com/SquidDev-CC/CC-Tweaked/wiki/Monitor-texture-reference
``` ```
7f90f2f7cadce0d5b9177b16626979591bce8137
``` ```
7f90f2f7cadce0d5b9177b16626979591bce8137
Clean up some examples a little bit Clean up some examples a little bit
Would be good if they didn't crash and burn on entry :). Would be good if they didn't crash and burn on entry :).
``` ```
```
f194f4fa3a17c48ff1a9088d50063f4a675a23b6
Fix epoch documentation to use milliseconds (#580)
```

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

@@ -326,14 +326,14 @@ public class OSAPI implements ILuaAPI {
} }
/** /**
* Returns the number of seconds since an epoch depending on the locale. * Returns the number of milliseconds since an epoch depending on the locale.
* *
* * If called with {@code ingame}, returns the number of seconds since the world was created. This is the default. * If called with {@code utc}, * * If called with {@code ingame}, returns the number of milliseconds since the world was created. This is the default. * If called with {@code utc},
* returns the number of seconds since 1 January 1970 in the UTC timezone. * If called with {@code local}, returns the number of seconds since 1 January * returns the number of milliseconds since 1 January 1970 in the UTC timezone. * If called with {@code local}, returns the number of seconds since 1 January
* 1970 in the server's local timezone. * 1970 in the server's local timezone.
* *
* @param args The locale to get the seconds for. Defaults to {@code ingame} if not set. * @param args The locale to get the milliseconds for. Defaults to {@code ingame} if not set.
* @return The seconds since the epoch depending on the selected locale. * @return The milliseconds since the epoch depending on the selected locale.
* @throws LuaException If an invalid locale is passed. * @throws LuaException If an invalid locale is passed.
*/ */
@LuaFunction @LuaFunction