mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-07-02 18:13:21 +00:00
Code Issues Releases Wiki Activity
669 Commits 20 Branches 223 Tags 29 MiB
8775052dee
Commit Graph

294 Commits

Author SHA1 Message Date
SquidDev
8775052dee Merge pull request #543 from hugeblank/ComputerCraft/patch-1 
amend typo in keys.lua
 2018-05-08 09:46:14 +01:00
hugeblank
c0c5d57e10
amend typo in keys.lua 
The most important commit that CC has ever seen.
 2018-05-08 01:10:45 -07:00
SquidDev
a1d77ab8e7 Merge pull request #536 from Luca0208/ComputerCraft/master 
Make wget automatically determine the file name.
 2018-04-06 21:08:54 +01:00
SquidDev
7c218361d9 Merge pull request #528 from SquidDev-CC/ComputerCraft/feature/computer-upgrade 
Add recipes to upgrade computers
 2018-03-15 17:39:17 +00:00
SquidDev
bb2eab0bed Use the ore dictionary for upgrade recipes 
See #517 for motivation
 2018-03-15 17:34:58 +00:00
SquidDev
e8c0cf3857 Convert TurtleRecipe to use ComputerConvertRecipe 
The two recipes are pretty similar, so this allows us to substantially
simplify the code. This now introduces the additional requirement that
computers must be used to create turtles, rather than pocket computers
or another turtle.
 2018-03-13 14:21:39 +00:00
SquidDev
db825a7aab Add recipes to convert computer items into their upgraded counterparts 
This adds IComputerItem.withFamily(ItemStack, ComputerFamily) as well as
a ComputerFamilyRecipe class. Each type of computer (normal, turtle,
pocket) defines a recipe using this class, as they require a different
number of gold ingots to upgrade.
 2018-03-13 14:14:36 +00:00
SquidDev
922f424a78 Add full block wired modems 
These act similarly to conventional wired modems, but with the advantage
that they are a full block. This means they can be attached to
peripherals which are not solid (such as chests). Further more, as they
do not have a direction, they allow wrapping peripherals on all 6 sides.

It's worth noting that wired modems do not require a cable - they will
automatically form connections to adjacent network elements when placed.
 2018-02-21 15:40:08 +00:00
SquidDev
d3ecd5214b Merge remote-tracking branch 'SquidDev-CC-ComputerCraft/feature/turtle-event' 2018-02-16 10:48:43 +00:00
SquidDev
0a8a8a742e Add config options to disable various turtle actions 
Mostly intended for those people who don't like .inspect() or
.getItemDetail(), but could allow modpacks to block equipping upgrades,
placing blocks, etc...
 2018-02-16 10:37:47 +00:00
SquidDev
54e1dafa3f Merge pull request #517 from SquidDev-CC/ComputerCraft/feature/ore-dict 
Add ore dictionary support to all recipes
 2018-02-04 20:06:34 +00:00
SquidDev
3ac76bc05b Add ore dictionary support to all recipes 2018-02-04 20:02:12 +00:00
SquidDev
c3454a195d Merge branch 'master' of https://github.com/dan200/ComputerCraft 2018-01-15 17:18:48 +00:00
Wojbie
0d28c67534 Fix advanced monitor recipe. 
Fix recipe to create 4 monitors.
 2018-01-14 23:03:14 +01:00
Daniel Ratcliffe
3e265c27ff
Merge pull request #455 from Wilma456/fileread 
Add read() to Filehandle
 2018-01-13 00:58:19 +00:00
Daniel Ratcliffe
8d356f50c4
Merge pull request #440 from Wilma456/iomulti 
Make io.write() accept multiple args
 2018-01-13 00:48:07 +00:00
Daniel Ratcliffe
f30c4f16c0
Merge pull request #411 from Wilma456/copyfixup 
Fix Bug in copy.lua, mkdir.lua and rename.lua (updated)
 2018-01-13 00:32:55 +00:00
Daniel Ratcliffe
8bb8caa315
Merge pull request #448 from Wilma456/writecheck 
Fix check of write()
 2018-01-13 00:28:08 +00:00
SquidDev
0f17a3d72e Merge branch 'master' of https://github.com/dan200/ComputerCraft 2018-01-12 14:15:22 +00:00
Daniel Ratcliffe
7647369e2d
Merge pull request #446 from Wilma456/moduledir 
Add folder /rom/modules
 2018-01-12 14:10:50 +00:00
Daniel Ratcliffe
2a16a1df85
Merge pull request #486 from Wilma456/extensionfix 
Fix Bug in Paint and Edit
 2018-01-12 13:59:15 +00:00
Daniel Ratcliffe
c3db91f11f
Merge pull request #485 from Luca0208/patch-1 
Removed the "the" that was too much(In /rom/help/cd.txt)
 2018-01-12 13:56:48 +00:00
SquidDev
4e9034f910 Make http.websocket call synchronous in bios.lua 
I thought I'd done this already, but it's possible it got lost during a
rebase.
 2017-12-06 09:28:38 +00:00
SquidDev
d7301ff15e Merge pull request #412 from Wilma456/ComputerCraft-1/textfix 
Add Check to textutils.tabulate/pagedTabulate
 2017-11-15 16:58:13 +00:00
SquidDev
1cf10c5c47 Merge pull request #490 from zardyh/ComputerCraft/master 
Propagate errors arising from API loading
 2017-11-15 16:51:26 +00:00
SquidDev
6691ec8e3a Merge pull request #390 from Wilma456/ComputerCraft-1/errormsg 
Show fs error in paint and edit
 2017-11-15 16:39:37 +00:00
SquidDev
a9f77221ff Merge pull request #469 from Wilma456/ComputerCraft-1/newrecipe 
Add more Recipes to Recipebook
 2017-11-15 16:35:27 +00:00
hydraz
d766f8b34e Propagate errors arising from API loading 2017-11-15 14:22:36 -02:00
SquidDev
ed8e9d7817 Add support for enabling Lua's debug library 
Whilst I'm pretty sure this is safe for general use, I'm disabling this
by default for now. I may consider enabling it in the future if no
issues are found.
 2017-11-15 12:18:10 +00:00
SquidDev
6c29b44c3c Merge pull request #440 from Wilma456/ComputerCraft-1/iomulti 
Make io.write() accept multiple args
 2017-11-15 11:47:33 +00:00
SquidDev
c9181a121f Merge pull request #395 from SquidDev-CC/ComputerCraft/feature/websocket 
Websocket support
 2017-11-15 11:39:02 +00:00
SquidDev
30f4e0829f Add websocket support to HTTP API 
This uses Netty's websocket functionality, meaning we do not have to
depend on another library.

As websockets do not fit neatly into the standard polling socket model,
the API is significantly more event based than CCTweaks's. One uses
http.websocket to connect, which will wait until a connection is
established and then returns the connection object (an async variant is
available).

Once you have a websocket object, you can use .send(msg) to transmit a
message. Incoming messages will fire a "websocket_message" event, with
the URL and content as arguments. A convenience method (.receive())
exists to aid waiting for valid messages.
 2017-11-15 11:32:17 +00:00
SquidDev
2155fce036 Merge pull request #486 from Wilma456/ComputerCraft-1/extensionfix 
Fix Bug in Paint and Edit
 2017-11-14 23:55:14 +00:00
SquidDev
27602ec8fc Merge pull request #485 from Luca0208/ComputerCraft/patch-1 
Removed the "the" that was too much(In /rom/help/cd.txt)
 2017-11-14 23:54:54 +00:00
SquidDev
66f683d9c9 Merge pull request #475 from Wilma456/ComputerCraft-1/ioline 
Fix io.lines()
 2017-11-14 23:53:50 +00:00
SquidDev
fe0f998c27 Merge pull request #448 from Wilma456/ComputerCraft-1/writecheck 
Fix check of write()
 2017-11-14 23:50:12 +00:00
Wilma456
bcf79165f9 Merge pull request #455 from Wilma456/ComputerCraft-1/fileread 
Add read() to Filehandle
 2017-11-14 23:48:38 +00:00
Wilma456
c5d99db654 Merge pull request #411 from Wilma456/ComputerCraft-1/copyfixup 
Fix Bug in copy.lua, mkdir.lua and rename.lua (updated)
 2017-11-14 23:24:11 +00:00
SquidDev
540e2e25aa Merge pull request #163 from SquidDev-CC/ComputerCraft/feature/cobalt 
Replace LuaJ with Cobalt
 2017-11-14 21:48:47 +00:00
SquidDev
b2b8753ee7 Merge pull request #227 from SquidDev-CC/ComputerCraft/feature/improved-cable 
Improving cable/wired modem interactions
 2017-11-14 21:32:53 +00:00
SquidDev
060fb21bdb Merge pull request #298 from SquidDev-CC/ComputerCraft/feature/luaj-bit32 
Replace BitAPI with a LuaJ implementation of bit32
 2017-11-14 21:32:19 +00:00
SquidDev
ef008709c7 Merge pull request #402 from SquidDev-CC/ComputerCraft/feature/shell-resolution 
Tweak shell program resolution slightly
 2017-11-14 21:31:10 +00:00
SquidDev
0bd0f4d313 Prefix all loaded strings with "=" 
Whilst this is not consistent with normal Lua, this is required in order
to remain compatible with LuaJ.
 2017-11-14 18:41:01 +00:00
SquidDev
0420b6c831 Remove string metatable protection 
The string metatable and environment are no longer shared, so this
sandboxing is no longer required.
 2017-11-14 18:41:00 +00:00
Wilma456
9e19dd7070 Fix Bug in Paint and Edit 2017-11-02 20:14:34 +01:00
Luca S
aba0e3d2d4
Removed the "the" that was too much 2017-10-29 19:06:34 +01:00
SquidDev
75ccfbdb3d Migrate cable core block state to an enum 
This allows us to render the cable "core", as was done pre-1.8.
 2017-10-04 21:49:40 +01:00
Wilma456 (Jakob0815)
999351e667 Fix io.lines() 2017-10-04 18:51:48 +02:00
Wilma456
11e879db41 Removce Bow Upgrade Recipe 2017-09-29 18:56:52 +02:00
Wilma456
a4a774fcdf Add more Recipes to Recipebook 2017-09-27 20:08:48 +02:00