mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-11-13 05:19:59 +00:00
Code Issues Releases Wiki Activity
406 Commits 23 Branches 230 Tags 30 MiB
26bca2e109
Commit Graph

406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SquidDev
26bca2e109 Fix setting an invalid content-encoding header 2017-07-31 07:50:23 +01:00
Daniel Ratcliffe
579f7443a8 Merge pull request #360 from Wojbie/Mixed-lua-side-improvements.-Part-2 
Mixed-Lua-side-improvements.-Part-2
 2017-07-25 23:15:10 +01:00
Daniel Ratcliffe
df1c8e22b8 Merge pull request #376 from CrazedProgrammer/fix-argument-checks 
Fix argument checks made in PR #304 and #338
 2017-07-25 23:13:34 +01:00
CrazedProgrammer
96288164c5 Fix textutils.serializeJSON argument check 2017-07-25 22:36:54 +02:00
Daniel Ratcliffe
f480965e67 Merge pull request #372 from Wilma456/apispro 
Update alias.lua
 2017-07-25 20:32:30 +01:00
Daniel Ratcliffe
6701403370 Merge pull request #364 from KingofGamesYami/feature/computer-get-label 
Add .getLabel
 2017-07-25 20:06:22 +01:00
Daniel Ratcliffe
ff2c26c4a1 Merge pull request #367 from SquidDev-CC/feature/texture-spacing 
Fix texture artifacts when rendering monitors
 2017-07-25 20:05:31 +01:00
Wojbie
4c89364964 Requested changes 2017-07-25 21:01:04 +02:00
Daniel Ratcliffe
94613d28a6 Merge pull request #381 from Wilma456/colerror 
Better Error for "Invalid color"
 2017-07-25 19:56:59 +01:00
Daniel Ratcliffe
f6ea561270 Merge pull request #374 from Wilma456/packapis 
Add package to apis.lua
 2017-07-25 19:05:11 +01:00
Daniel Ratcliffe
b4fb7bb20f Merge pull request #354 from Wilma456/multifix 
Fix multishell.launch
 2017-07-25 19:04:39 +01:00
Daniel Ratcliffe
35d29e1d88 Merge pull request #348 from Wilma456/termcheck 
Update term.redirect check to new style
 2017-07-25 19:03:55 +01:00
Daniel Ratcliffe
f14a14f4c3 Merge pull request #355 from MineRobber9000/patch-2 
Make pastebin.lua use HTTPS
 2017-07-25 19:03:15 +01:00
Daniel Ratcliffe
77cadf52fe Merge pull request #351 from Wojbie/Fix-to-349-Monitors-causing-miscolouration-of-tile-entities 
Fix to #349 - Monitors causing miscolouration of tile entities.
 2017-07-25 19:02:43 +01:00
Daniel Ratcliffe
e97a32cd69 Merge pull request #375 from SquidDev-CC/feature/resourcepack-bios 
Adds the ability to load custom bios.lua files from resource packs
 2017-07-25 19:02:05 +01:00
Daniel Ratcliffe
44a5284dd6 Merge pull request #379 from SquidDev-CC/hotfix/nil-errors 
Fix incorrect null check in HTTP API
 2017-07-25 19:00:25 +01:00
Wilma456 (Jakob0815)
43a5fc9fe7 Better Error for "Invalid color" 
the "Invalid color" error now contain the wrong color.
 2017-07-18 16:12:19 +02:00
SquidDev
505ccf97cf Fix incorrect null check 
This was causing NPEs when no headers were specified and one was
attempting to POST data.
 2017-07-17 22:46:48 +01:00
CrazedProgrammer
1850dcdf38 Fix indentation of previous commits (tabs -> spaces) 2017-07-15 13:01:08 +02:00
CrazedProgrammer
af0549946b Fix window API argument check made in PR #304 
- Fix window.reposition so the new width and height arguments are
optional
 2017-07-15 00:17:34 +02:00
CrazedProgrammer
7e5a9b3a5a Fix some textutils API argument checks made in PR #338 
- textutils.serializeJSON now takes a table/string/number/boolean instead of just a string as the t argument, and checks for nil in the tNBTStyle argument, so the parameter becomes optional again, as described in the wiki.
- textutils.slowWrite and textutils.slowPrint now checks if the rate
parameter is a number, if not nil.
 2017-07-15 00:00:01 +02:00
SquidDev
c0294e1534 Adds the ability to load custom bios.lua files from resource packs 
Computer now delegates to IComputerEnvironment which, by default, looks
in the following locations:

 - Resouce pack files
 - The "debug" folder
 - The original ComputerCraft jar
 2017-07-14 21:58:58 +01:00
Wilma456 (Jakob0815)
bb6d423710 Add package to apis.lua 2017-07-14 12:50:59 +02:00
Wilma456 (Jakob0815)
0ab79fd466 Update alias.lua 
The apis program show now, waht programs are behind the aliases
 2017-07-13 16:04:55 +02:00
Bomb Bloke
756d297c85 Update worm.lua 
Fix #368
 2017-07-11 10:24:36 +10:00
SquidDev
1cf3d78eac Fix texture artifacts when rendering monitors 
- Adds a 1px margin around every glyph. This is generally empty,
   with the exception of teletext characters where it continues their
   pattern.
 - Uses GL_CLAMP with the font texture.

Closes #300
 2017-07-10 22:20:07 +01:00
Steven Dirth
f1bb56557d Update changelog and whatsnew 2017-07-09 12:45:08 -05:00
Steven Dirth
4b36ed6719 Add .getLabel to computer peripheral 
Closes #359
 2017-07-09 12:43:50 -05:00
KingofGamesYami
592c0c9341 Merge pull request #1 from dan200/master 
update 7/8
 2017-07-08 16:17:24 -05:00
SquidDev
e664eb26a9 Fix several global definitions 
There were a couple of programs which were defining global variables, or
referencing undefined ones. This fixes all problems in the main rom files.
 2017-07-08 11:31:30 +00:00
SquidDev
1ab5094b7f Only delete indent when at the beginning of a line 
edit currently deletes the previous 4 spaces when pressing backspace,
wherever you are on the line. This can be frustrating when you are
trying to align text in comments or strings.

This changes edit to only delete 4 spaces if all preceding characters
are whitespace, otherwise it only deletes a single character.
 2017-07-08 12:07:30 +01:00
Daniel Ratcliffe
94d701b1f7 Merge pull request #350 from Wilma456/argnil 
Replaced "no value" with "nil" in ArgumentHelper
 2017-07-07 20:58:09 +01:00
Daniel Ratcliffe
db2364dae6 Merge pull request #357 from SquidDev-CC/hotfix/credits-include 
Various improvements to credits generation
 2017-07-07 20:57:36 +01:00
Wojbie
87406bc00d Tweak to Colon syntax lua autocompletition. 
Changes autocompletition to only complete function names (Or table names treated as functions via __call metamethod) after the colon symbol.
 2017-07-07 02:30:57 +02:00
Wojbie
224e752a8f Tweak to Go and Turn autocompletition. 
Adds spaces to simplyfy making chains of commands.  Also fix up turn not autocompleting after first argument.
 2017-07-07 02:18:24 +02:00
SquidDev
48754659f8 Various improvements to credits generation 
- Include author and comitter (so includes rebased commits)
 - Ignore case when sorting names

Fixes #356
 2017-07-06 17:27:20 +01:00
MineRobber___T
f0559867d0 Fix pastebin.lua not using HTTPS 
Attempting to use pastebin with plain HTTP results in a 301 redirect to the HTTPS version. This PR (and associated commit) makes the pastebin command work again.
 2017-07-06 03:58:41 -04:00
Wilma456
02eb52da71 Fix multishell.launch 2017-07-05 10:17:44 +02:00
Wojbie
ef05eb7fe9 @SquidDev fix to #349. 
This fixes problem reported in #349.
I was one of pepole that were having this bug so i was able to test it and confirm this fix.

Closes #349
 2017-07-04 22:54:20 +02:00
Wilma456
6fdf38f55f Replaced "no value" with "nil" in ArgumentHelper 2017-07-04 12:44:20 +02:00
Wilma456
c46391555f Update term.redirect check to new style 2017-07-03 18:08:51 +02:00
Daniel Ratcliffe
1d63598d43 Merge pull request #338 from Wilma456/textcheck 
Add Checks to Textutils API
 2017-06-29 19:04:37 +01:00
Wilma456
5e244273c2 Allow Number and Table 2017-06-29 17:58:53 +02:00
Daniel Ratcliffe
b0a2dd5eb1 Merge pull request #344 from Wilma456/othercheck 
Add Checks to disk,gps,help and keys
 2017-06-29 16:09:46 +01:00
Wilma456
13f886be5a Add Checks to disk,gps,help and keys 2017-06-29 16:41:48 +02:00
Wilma456
845e1b633d Merge branch 'master' into textcheck 2017-06-29 16:24:30 +02:00
Wilma456
6a8c544914 Feedback from dan200 2017-06-29 16:18:13 +02:00
Daniel Ratcliffe
123a0158af Merge pull request #313 from SquidDev-CC/feature/http-blacklist 
HTTP blacklist and IP address support
 2017-06-28 22:36:14 +01:00
SquidDev
b37b33f4f4 Migrate default whitelist/blacklist values to fields 
This means we're not duplicating them between the initial field and
property creation.
 2017-06-28 22:33:20 +01:00
Daniel Ratcliffe
00a1342883 Merge pull request #297 from SquidDev-CC/feature/fire-events 
Fire Forge events where appropriate
 2017-06-28 22:32:22 +01:00