mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-11-16 23:04:53 +00:00
Code Issues Releases Wiki Activity
1,766 Commits 22 Branches 232 Tags 30 MiB
92a0ef2b75
Commit Graph

727 Commits

Author SHA1 Message Date
Jonathan Coates
999a39a3e6
Merge branch 'mc-1.15.x' into mc-1.16.x 2021-07-15 13:05:31 +01:00
Jonathan Coates
82ca19c296
Add type check for http.checkURL 2021-07-15 13:04:44 +01:00
Jonathan Coates
db0bb071f5
Add motd for file uploading 2021-07-15 10:58:52 +01:00
SkyTheCodeMaster
d4efacd40a
Turn a nil to a string 
Makes a `nil` a string inside of an expect in `define`, allowing `nil` to be passed.
 2021-07-15 10:54:30 +01:00
SkyTheCodeMaster
8dbc930c2f
Turn a nil to a string 
Makes a `nil` a string inside of an expect in `define`, allowing `nil` to be passed.
 2021-07-04 20:54:55 -04:00
Jonathan Coates
61eb67849d
Some fs examples 
See #566
 2021-07-03 14:05:41 +01:00
Jonathan Coates
efa2be2821
Update changelog for 1.16.x-only features 2021-06-28 22:58:13 +01:00
Jonathan Coates
670db97fc7
Merge branch 'mc-1.15.x' into mc-1.16.x 2021-06-28 22:52:05 +01:00
Jonathan Coates
1650b72edb
Prepare for 1.97.0 release 2021-06-28 22:52:01 +01:00
Jonathan Coates
a5bca3f0df
File uploading (#840) 2021-06-28 22:49:45 +01:00
Jonathan Coates
88f41314c7
Make io handles opaque to the docs 
Yep, this is kinda gross. But also a nice refactor
 2021-06-28 22:47:56 +01:00
Jonathan Coates
5ef8d52c13
Merge branch 'mc-1.15.x' into mc-1.16.x 2021-06-28 18:37:24 +01:00
Lupus590
b3f2f14e96
remove extra , 2021-06-23 15:14:01 +01:00
Jonathan Coates
3ace49d27f
Remove config option for debug API 
And also remove the "is present" guards within the various APIs. I'm
happy at this point that debug is safe, and think we can guarantee its
presence.
 2021-06-22 21:01:05 +01:00
Jonathan Coates
df7a40354e
Merge branch 'mc-1.15.x' into mc-1.16.x 2021-06-19 15:18:12 +01:00
Jonathan Coates
c489d4bc4f
Fix exiting paint typing "e" in the shell 
When exiting paint via the keyboard by typing "Ctrl" then "E"
separately, we consume the "key" event within paint, leaving the shell
to consume "read".

To avoid this, we run a sleep(0) to gobble any other left-over events.

Note, it's generally not enough to run a queueEvent/pullEvent here, as
the char event may not have ended up on the queue yet. Alas, as this
solution is pretty ugly.
 2021-06-19 15:13:26 +01:00
Jonathan Coates
0bfe960cbd
Merge branch 'mc-1.15.x' into mc-1.16.x 2021-06-19 12:41:30 +01:00
Jonathan Coates
a735f23e1f
Fix a couple of bugs with wget 
- Provide a friendly message when writing to a file fails.
 - Correctly write empty files

Fixes #832, closes #833
 2021-06-19 11:59:15 +01:00
Jonathan Coates
d71bf225cc
Add very simple markdown support to the help viewer (#819) 
- Allow help files to use the ".md" suffix, and move changelog/whatsnew
   to use them.

 - When files end with ".md", the "help" program attempts to highlight
   them. This involves:
   - Colour code blocks with a lightGrey background.
   - Replace lists to use bullet points instead of "-"/"*".
   - Colours headings yellow.
   The implementation of this is a bit janky because a) I wrote this and
   b) we need to run this step before text wrapping, but preserve
   colours and section positions over wrapping (thanks to Jack for
   getting this working).

 - Add section navigation to the help viewer, with left/right to move to
   the next/previous section.

Closes #569
 2021-06-12 19:48:41 +01:00
Wojbie
b323db30ee
Add cc.shell.completion programWithArgs completion. (#815) 
And expand monitor, shell, fg and bg to use it
 2021-06-07 22:02:45 +01:00
JackMacWindows
53efd6b303
Fixed error handling in scale subcommand (#816) 2021-06-07 20:47:15 +01:00
Jonathan Coates
97faa1b3bc
Fix several sidebar textures 
There was an off by one here!
 2021-06-07 18:34:57 +01:00
Jonathan Coates
e18e24407e
Add additional buttons to the computer GUI (#809) 
Adds a sidebar to the computer and turtle GUI. This currently provides
 - A power indicator, which turns on/shuts down a computer.
 - Button to queue a "terminate" event
 2021-06-06 19:32:52 +01:00
Matthew Wilbern
f8074636bc
Allow craft program to craft unlimited items (#807) 2021-06-06 06:52:01 +01:00
Jonathan Coates
5eec7d9172
Bump to 1.16.5 
I don't think anyone still uses 1.16.4, so no point worrying about it.

Closes #808
 2021-06-05 12:32:40 +01:00
Jonathan Coates
f38a6a9d43
Merge branch 'mc-1.15.x' into mc-1.16.x 2021-06-05 11:36:30 +01:00
Matthew Wilbern
7fc55aa9a0
Add __eq metamethod and equals method to the vector api. (#800) 2021-05-31 13:58:46 +01:00
magiczocker10
38335ca187
Add some options for textutils.serialize (#664) 2021-05-29 17:46:58 +01:00
JackMacWindows
e0e194099c
Add a scale subcommand to monitor.lua (#623) 2021-05-29 16:55:55 +01:00
Jonathan Coates
9f7cc00fcb
Add button to view computer's folder 
Implementation is a little awkward, as we can't send OPEN_FILE links
from the server, so we ensure the client runs a
/computercraft open-computer ID command instead. We then intercept this
on the client side and use that to open the folder.
 2021-05-28 22:19:04 +01:00
Jonathan Coates
b129ae627b
Make cc.pretty internals more opaque 
I wish I had an actual type system.
 2021-05-28 21:28:56 +01:00
Weblate
58ea7a275e Translations for French 
Translations for French

Translations for German

Co-authored-by: Anavrins <xanavrins@gmail.com>
Co-authored-by: Jummit <jummit@web.de>
Co-authored-by: Naheulf <newheulf@gmail.com>
 2021-05-24 01:01:57 +00:00
Jonathan Coates
8b8692ba53 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-05-20 18:30:10 +01:00
Jonathan Coates
1f385f5b35 Bump version to 1.94.0 2021-05-20 18:29:57 +01:00
JackMacWindows
e0a288bcb9
Add the ability to call cc.expect directly 2021-05-19 20:14:13 -04:00
Lupus590
28165bfcd6
Add cc.expect.range (#790) 2021-05-17 17:49:48 +01:00
Jonathan Coates
e10e30f82b Use a separate region for the bottom pocket computer border 
This is definitely not a good solution, but it's probably the best we
can do right now given resizable computers are a thing.

Fixes #775, closes #776
 2021-05-16 18:40:18 +01:00
Jonathan Coates
aeb1fa0e7e Optimise all textures 
using "optipng -o7 -strip all". I ran this a few years ago and had some
issues, but aren't seeing any problems now. I don't know if this is a
graphics card change, or just optipng fixed some bugs.

These are fairly minimal changes, but hopefully save a few bytes!
 2021-05-16 18:00:47 +01:00
Jonathan Coates
b0e30fdce1 Use lightGrey for folders on normal computers 
This way we still get some differences between files and folders on
normal computers. I did try with just green, but I think the contrast is
too low.

Closes #656
 2021-05-05 22:10:19 +01:00
Jonathan Coates
bc8e090873 Simplify our overrides of load/loadstring 
- Remove auto-prefixing of load/loadstring
 - Use Cobalt's normal load implementation, with a simple hook to
   set _ENV on the environment.
 2021-05-04 18:30:28 +01:00
Jonathan Coates
cf0f67265f Correctly handle sparse arrays in cc.pretty 
This also swaps the order we display mixed array/maps in, so that the
array part comes first. I think this is more sensible.

Closes #777
 2021-05-04 18:05:56 +01:00
Jonathan Coates
eb2d617ed8 Add a pre commit hook to lint code 
This uses pre-commit [1] to check patches are well formed and run
several linters on them. We currently do some boring things (check files
are syntactically valid) as well as some project-specific ones:
 - Run illuaminate on the Lua files
 - Run checkstyle on Java

[1]: https://pre-commit.com/
 2021-04-28 21:24:27 +01:00
Jonathan Coates
f387730b88 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-04-24 11:50:23 +01:00
Jonathan Coates
058d63e77f Add citation to cc.pretty 
ust to look extra pretentious.
 2021-04-11 18:43:24 +01:00
Jonathan Coates
17b5bca443 Make the peripheral API examples a little clearer 2021-04-07 18:34:55 +01:00
Jonathan Coates
51d3b091da "Finish" documentation for several modules 
- Add remaining docs for the turtle API
 - Add documentation for the fluid storage peripheral.
 - Enforce undocumented warning for most modules (only io and window
   remaining).

"Finish" in quotes, because these are clearly a long way from perfect.
I'm bad at writing docs, OK!
 2021-04-03 12:45:54 +01:00
lily
9708dd6786
Fixed sortCoords for draw functions (#749) 2021-04-02 15:30:28 +01:00
Jonathan Coates
e48427dbbc Add documentation for io.setvbuf 
Fixes #746.

Love how "good first issue" guarantees that nobody will do it. Not
actually true, and thank you for those people who have contributed!
 2021-03-28 19:38:25 +01:00
Wojbie
32d956bbe7 Fix missing term.setCursorBlink(true) in edit.lua 2021-03-19 16:07:20 +01:00
Jonathan Coates
8c56b6a7be Merge branch 'mc-1.15.x' into mc-1.16.x 2021-03-12 09:26:15 +00:00
Jonathan Coates
66e42e0817 Bump version to 1.95.3 2021-03-12 09:19:16 +00:00
Wojbie
1f70ed6985
Make edit display errors/results of execution and handle require. (#723) 2021-02-23 20:50:19 +00:00
Weblate
8f3ea60c74 Translations for Portuguese (Brazil) 
Co-authored-by: Matheus Medeiros Souza <mmedeiros.cbp@gmail.com>
 2021-02-21 13:42:57 +00:00
Jonathan Coates
1316d6a3c9 Migrate all examples to use tweaked.cc 
Might as well, I've got the server capacity to spare. Hopefully.
 2021-01-23 14:58:08 +00:00
FensieRenaud
763bab80fa Serialise sparse arrays into JSON (#685) 2021-01-18 20:48:33 +00:00
FensieRenaud
417fda3019
Serialise sparse arrays into JSON (#685) 2021-01-18 16:44:39 +00:00
Jonathan Coates
0be030c497 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-01-16 11:38:59 +00:00
Jonathan Coates
ee27d8f081 Bump version to 1.95.2 2021-01-16 11:18:59 +00:00
Jonathan Coates
a3a9684505 Widen version range to include 1.16.5 
Building against 1.16.4 for now to ensure we don't break it. Hopefully
we can bump this too once most people have migrated.

Will push a release tomorrow - don't want to be sorting out merge
conflicts at 23:30.
 2021-01-15 23:26:01 +00:00
Wojbie
c83eeb16a8
id.lua now handles more disk types (#677) 
Co-authored-by: Lupus590 <lupussolitarius590@gmail.com>
 2021-01-15 19:30:21 +00:00
Jonathan Coates
fd262a7995 Clarify the cc.strings.wrap docs a little 
Also make the example a bit more "useful". Hopefully this should clarify
that the function returns a table rather than a single string.

Closes #678.
 2021-01-14 09:12:37 +00:00
Wojbie
1f84480a80
Make rightAlt only close menu, never open it. (#672) 
Fixes #669
 2021-01-11 21:59:29 +00:00
Jonathan Coates
7b476cb24b Remove usage of deprecated event constructor 
This requires a Forge bump, but probably no harm in doing so anyway.
We're on an ancient (2nd Nov) version. Fixes #665.
 2021-01-09 18:49:40 +00:00
Jonathan Coates
7ca261d763 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-01-09 18:32:40 +00:00
Wojbie
b2e5401486
Added Numpad Enter Support in rom lua programs. (#657) 2021-01-07 21:41:04 +00:00
Jonathan Coates
1edb7288b9 Merge branch 'mc-1.15.x' into mc-1.16.x 2021-01-06 22:39:54 +00:00
Jonathan Coates
cc5e972cfc Bump version to 1.95.1 
Will actually release tomorrow - it's getting quite late right now.
 2021-01-06 22:39:26 +00:00
Jonathan Coates
72340defe4 Update illuaminate 
- Fix doc library-path
 - Only style <pre> code blocks as executable. Skip <code> ones.
 - Document the default parameters in gps. Yes, we should do it
   everywhere, but one has to start somewhere!
 2021-01-06 17:42:47 +00:00
Jonathan Coates
b8d5a89446 Add explicit @module annotation 
This feels like a bug - it should be inferred automatically.
 2020-12-25 17:42:53 +00:00
Jonathan Coates
96c577482d Merge branch 'mc-1.15.x' into mc-1.16.x 2020-12-25 16:43:32 +00:00
Jonathan Coates
7f9a707f75 Bump version to 1.95.0 
As is tradition.
 2020-12-25 16:40:50 +00:00
Jonathan Coates
ed3913c1f4
Manually wrap strings for help (#602) 
This saves us writing to a buffer multiple times, and so makes things much,
much faster.
 2020-12-23 16:33:58 +00:00
Lupus590
16d74dd2e8 Add functions to wrap text 2020-12-23 16:21:04 +00:00
TheWireLord
b97e950d86 Added Numpad Enter Support - bios.lua 
Add the ability to use Numpad Enter and have it act just like normal Enter.
(Just like the web-based emulator on the Tweaked.cc wiki)
 2020-12-12 16:45:02 -05:00
JackMacWindows
24d3777722
Added improved help viewer (#595) 
- Pagination, with (page) up/down, q(uit) and scrolling support.
 - Render markdown style bullets ('-'/'*') using a '•' instead.
 2020-12-02 19:22:12 +00:00
Jonathan Coates
511eea39a1
Remove <!-- -->s in usages 
We fixed the bug in illuaminate, so this should be redundant now.
 2020-11-28 17:53:07 +00:00
SquidDev
6734a0e112 Also generate computer models 
I'm getting quite addicted to this. Maybe less savings than monitors,
but still worth doing due to the number of files created.

Also fix our angle calculations for monitors. Thankfully we hadn't
shipped this yet :).
 2020-11-28 12:06:46 +00:00
SquidDev
04f9644ae7 Allow strings or numbers in textutils.*tabulate 
A little dubious, but apparently CC used to support it. This means we're
consistent with methods like io.write or string.len which accept strings
or numbers.

Fixes #591
 2020-11-27 21:29:11 +00:00
JackMacWindows
486f41f082
Fixed length check on function name in expect (#589) 2020-11-26 19:46:03 +00:00
Lupus590
fff8353451
Remove extra space (#586) 2020-11-21 12:25:19 +00:00
Lupus590
9a749642d2
Strict Globals (#583) 2020-11-21 12:11:40 +00:00
SquidDev
c35707725f More examples 
Yay!
 2020-11-20 21:59:17 +00:00
SquidDev
b0651082f4 Cleanup examples for the various modules 2020-11-20 19:36:28 +00:00
SquidDev
aab0cd34cd Use term.blit on original paint render 
This makes it super speedy, meaning an initial refresh doesn't take ages
to load.
 2020-11-20 15:06:47 +00:00
Luca
d2a1a00dc4
Clear gets an option to reset the palette (#582) 
Fixes #555.
 2020-11-17 12:53:20 +00:00
SquidDev
7f90f2f7ca Clean up some examples a little bit 
Would be good if they didn't crash and burn on entry :).
 2020-11-12 19:40:18 +00:00
SquidDev
c8aeddedd4 Auto-generate monitor models 
I didn't think it was worth it, and then I found myself needing to
update a dozen of them. The code isn't especially pretty, but it works,
so that's fine.

Also fixes several issues with us using the wrong texture (closes #572).
I've put together a wiki page[1] which describes each texture in a
little more detail.

[1] https://github.com/SquidDev-CC/CC-Tweaked/wiki/Monitor-texture-reference
 2020-11-11 21:14:53 +00:00
SquidDev
83df64e520 Merge branch 'mc-1.15.x' into mc-1.16.x 2020-11-07 12:46:10 +00:00
SquidDev
74ac5bb3d1 Bump to 1.94.0 2020-11-07 12:43:57 +00:00
Lupus590
d13bd2cce8
use arg[0] in all usage printouts (#571) 2020-11-04 14:03:08 +00:00
SquidDev
ab232bd689 Update to MC 1.16.4 
Just some mapping changes really
 2020-11-03 15:33:10 +00:00
SquidDev
cc96e41d3e Remove stray copy-paste error from changelog 2020-11-03 14:37:24 +00:00
Drew Lemmy
741adfa7bb
Use blit to draw boxes, add colors.toBlit (#570) 2020-11-01 19:28:18 +00:00
SquidDev
666e83cf4f Fix JSON objects failing to pass 
Maybe I should run the whole test suite, not just the things I think
matter? Nah....
 2020-11-01 11:48:19 +00:00
SquidDev
c58441b29c Various SNBT parsing improvements 
Correctly handle:
 - Typed arrays ([I; 1, 2, 3])
 - All suffixed numbers (1.2d)
 - Single-quoted strings

Fixes #559
 2020-11-01 11:36:48 +00:00
SquidDev
c334423d42 Add function to get window visibility 
Closes #562

Co-authored-by: devomaa <lmao@distruzione.org>
 2020-10-31 09:54:38 +00:00
SquidDev
5bf367af9f Merge branch 'mc-1.15.x' into mc-1.16.x 2020-10-23 17:45:11 +01:00
SquidDev
61fb4caaad Bump to 1.93.1 2020-10-23 17:44:52 +01:00
Drew Lemmy
bf6053906d Fix TBO norm issues on old GPUs 2020-10-21 10:28:12 +01:00
Drew Lemmy
34a2c835d4
Add color table to docs (#553) 2020-10-11 21:37:56 +01:00