mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-08-31 22:58:53 +00:00
Code Issues Releases Wiki Activity
308 Commits 25 Branches 274 Tags
585c769c2a7d9c63de85756c277beac05e4f879b
Commit Graph
308 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SquidDev 585c769c2a Restructure the HTTP API 
- Adds support for blacklisting domains
 - Adds support for blacklisting & whitelisting IP addresses and
   IP ranges.
 - Reuse threads for HTTP requests

AddressPredicate will parse a series of patterns and convert them into
regexes or CIDR ranges. When checking whether an address is accessible,
we first ensure the domain is whitelisted and isn't blacklisted.

If everything is OK, then we start create a new thread for the HTTP
request and resolve the IP, ensuring that is whitelisted & not
blacklisted. Then the normal HTTP request is continued.

However, http.checkURL also needs to resolve the IP address. In order to
avoid blocking the Lua thread, this method will return instantly and
create a new thread which will queue an event.

As both http.request and http.checkURL are now creating threads and
queuing events, some logic is abstracted into a separate HTTPTask class
- this allows us to share the thread creation, finishing and cancelling
logic.
 2017-06-12 19:22:02 +01:00
Daniel RatcliffeandGitHub 0f982e6199 Merge pull request #303 from Wojbie/Window-api-fix 
Fix to setPaletteColour in rgb8 mode.
 2017-06-04 13:58:40 +01:00
Daniel RatcliffeandGitHub 4f3be7963e Merge pull request #304 from Wilma456/windowcheck 
Add checks to window API
 2017-06-04 13:57:51 +01:00
Daniel RatcliffeandGitHub 2cd4daa9ad Merge pull request #305 from Wojbie/Redirection-fix 
Fix to redirection game.
 2017-06-04 13:57:06 +01:00
Wojbie 60e9ce1b68 Fix to redirection game. 
Was not testing for correct file type. Game ended after first lvl cause it was looking from wrong name of file.
 2017-06-04 14:51:49 +02:00
Wilma456andGitHub c9bf463419 Add checks to window API 2017-06-04 12:34:40 +02:00
Wojbie a90e2a8bfd Fix to setPaletteColour in rgb8 mode. 
Was not saving color if called using rgb8 mode.
 2017-06-04 11:59:30 +02:00
Daniel RatcliffeandGitHub 3828750ade Merge pull request #302 from Wojbie/Wget-binary-mode 
Switch wget to use binary mode.
 2017-06-03 21:32:45 +01:00
Daniel RatcliffeandGitHub 5e3eb2c6a7 Merge pull request #299 from Wilma456/termbug 
Fix Bug with term.setCursorPos
 2017-06-03 21:31:56 +01:00
Wilma456andGitHub fd842be37f Remove second fix 2017-06-03 16:30:35 +02:00
Wojbie 0cc65adff9 Switch wget to use binary mode. 
Allows wget to download all types of files not only text ones.
 2017-06-03 13:19:57 +02:00
Wilma456andGitHub d6e4323f17 Fix Bug with term.setCursorPos 
I fixed 2 Bugs:
1. If you call this function, without 2 numbers, you get a error in the window API and not in your Program
2. If you call, this function with 2 numbers lower then 1 (e.g. term.setCursorPos(0,0) ), CraftOS will hang forever and need to press Ctrl+R or rejoin the world.
 2017-06-02 17:35:18 +02:00
Daniel RatcliffeandGitHub 114c49e3f6 Merge pull request #291 from Wilma456/apis 
Add multishell to apis program
 2017-05-29 16:57:42 +01:00
Daniel RatcliffeandGitHub 26077cbced Merge pull request #293 from Lignum/fix-warning 
Fix generic-related compiler warning
 2017-05-29 16:56:30 +01:00
Lignum 44c67796b8 Fix generic-related compiler warning 2017-05-29 17:35:41 +02:00
Wilma456andGitHub 9770f103ed Add multishell to apis program 2017-05-29 15:55:45 +02:00
Wilma456andDaniel Ratcliffe 07ae332c24 Add fileextension for Paint (#260) 
* Add fileextension for Paint

* Change extension to .nfp

* Add setting
 2017-05-29 14:05:19 +01:00
Wilma456andDaniel Ratcliffe 99b5534099 Add setting for .lua extension (#278) 
* Add setting for .lua extension

* Feedback  from SquidDev

* Feedback from dan200

* All requested changes are done

* Better description

* Cleaner check
 2017-05-29 13:21:27 +01:00
Daniel RatcliffeandGitHub 54d202cf6b Merge pull request #288 from Wojbie/getPaletteColour-fix 
Fix to getPalletteColour
 2017-05-28 13:40:56 +01:00
Wojbie 47f470910e Fix to getPalletteColour 
Done as @dan200 specified in #287. Closes #287.
 2017-05-28 14:08:15 +02:00
Daniel RatcliffeandGitHub 235131c3fb codesize.sh now only counts lua files 2017-05-28 12:18:12 +01:00
Daniel RatcliffeandGitHub 9f35d2a2b7 Merge pull request #282 from apemanzilla/contributors_task 
Dynamically generate contributors list
 2017-05-28 12:06:12 +01:00
Daniel RatcliffeandGitHub 934fd08506 Merge pull request #285 from MineRobber9000/patch-1 
Add github repo url to credits.txt
 2017-05-28 12:03:37 +01:00
Daniel RatcliffeandGitHub 7b182e32b8 Update credits.txt 2017-05-28 12:03:23 +01:00
MineRobber___TandGitHub 3d9d54beef Update credits.txt 
Add url of github repo to credits.
 2017-05-25 10:15:01 -04:00
apemanzilla 51b9f3ca3b Use template instead of separate task 2017-05-24 13:20:46 -04:00
apemanzilla 3b6ed552e3 Fix incorrect forEach usage 2017-05-24 12:42:49 -04:00
apemanzilla 5ff3ae6434 Add Gradle task to generate contributor list 2017-05-24 12:35:41 -04:00
Daniel RatcliffeandGitHub e66f0d7033 Merge pull request #268 from Wilma456/credits 
Add Contributors to credits.txt
 2017-05-24 13:21:52 +01:00
Daniel RatcliffeandGitHub b34adde6f3 Merge pull request #279 from lupus590/feature/lua_extention_for_tresure_disks 
.lua extentions for treasure disks
 2017-05-24 13:17:54 +01:00
Nephi (AKA Lupus590) 5f2446009d mass file rename, left some files... 
... as they are levels for nitrogenfingers goldrunner
 2017-05-22 21:34:49 +01:00
Wilma456andGitHub 19fc491532 Remove Ingamename and sort alphabetical 2017-05-22 17:18:11 +02:00
Daniel RatcliffeandGitHub 853e626756 Merge pull request #263 from Lignum/fix-speakers 
Speaker-related cleanup
 2017-05-20 12:27:12 +01:00
Lignum 0a2cb7442d Merge branch 'master' into fix-speakers 2017-05-20 13:23:12 +02:00
Daniel RatcliffeandGitHub d86aa50bec Merge pull request #267 from SquidDev-CC/feature/tutle-tool-changes 
Shovel upgrade converts grass to path blocks
 2017-05-20 12:16:47 +01:00
Wilma456 df2fe7c445 Add Contributors to credits.txt 2017-05-20 13:13:08 +02:00
Daniel RatcliffeandGitHub 6c85ca071f Merge pull request #266 from Wilma456/leveldat 
Add .dat extension to all redirection levels
 2017-05-20 11:57:26 +01:00
Daniel RatcliffeandGitHub aaa82dceab Merge pull request #265 from Wilma456/newhelp 
Add .txt extension to all help files (update)
 2017-05-20 11:56:04 +01:00
Wilma456 b31518cfb5 Add .dat extension to all redirection levels 2017-05-20 12:51:01 +02:00
Wilma456 e8ecf5dcd5 Add .txt extension to all help files 2017-05-20 12:20:27 +02:00
Lignum 163c1db6be Fix some if statements 2017-05-19 23:37:02 +02:00
Lignum c8697d9158 nTicks -> nPitch in speaker help file 
Not sure why this was called nTicks, but it had nothing to do with ticks.
 2017-05-19 20:27:08 +02:00
Lignum c2af482615 Format TileSpeaker and TurtleSpeaker 2017-05-19 20:25:08 +02:00
Lignum a402fc9093 Format SpeakerPeripheral correctly 2017-05-19 20:20:51 +02:00
Daniel RatcliffeandGitHub d822147704 Merge pull request #262 from Lignum/fix-spelling 
Fix some minor spelling mistakes
 2017-05-19 18:49:48 +01:00
Lignum 387fc13322 Pocket Computer upgrde -> Pocket Computer upgrade 2017-05-19 19:19:29 +02:00
Lignum b30191638f Ensure the existence, not existance 2017-05-19 19:17:23 +02:00
Lignum 95991694e0 Load modules, not modiles 2017-05-19 19:16:50 +02:00
Daniel Ratcliffe 9b6d335c5d small fix 2017-05-19 14:13:08 +01:00
Daniel RatcliffeandGitHub ffa075cd3d Merge pull request #259 from SquidDev-CC/hotfix/check-palette 
Add some sanity checks to Palette.readFromNBT
 2017-05-19 13:06:35 +01:00