496 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Daniel Ratcliffe	3b3dd8071b	Merge pull request #506 from Wojbie/Advanced-Monitor-Count-Fix ... Fix advanced monitor recipe.	2018-01-15 12:59:35 +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
Daniel Ratcliffe	7647369e2d	Merge pull request #446 from Wilma456/moduledir ... Add folder /rom/modules	2018-01-12 14:10:50 +00:00
Daniel Ratcliffe	4b4208e724	Merge pull request #476 from SquidDev-CC/hotfix/printer-clear ... Fix the printer overwriting the current page	2018-01-12 13:59:51 +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	25f7c58400	Merge pull request #494 from SquidDev-CC/hotfix/collision-aabb ... Fix getCollisionBoundingBox not using all AABBs	2018-01-12 13:57:50 +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
Daniel Ratcliffe	8c66ce03d4	Merge pull request #475 from Wilma456/ioline ... Fix io.lines()	2018-01-12 13:56:21 +00:00
Daniel Ratcliffe	2be2a0625e	Merge pull request #502 from SquidDev-CC/hotfix/missing-overlay ... Fix turtle overlay not being rendered in items	2018-01-12 13:54:59 +00:00
Daniel Ratcliffe	c904d5041b	Merge pull request #499 from SquidDev-CC/hotfix/null-network ... Fix ComputerCraftAPI.getWirelessNetwork() failing	2018-01-12 13:54:33 +00:00
SquidDev	019f4dbea9	Fix turtle overlay not being rendered in items	2017-12-24 21:44:55 +00:00
SquidDev	11290f7204	Fix ComputerCraftAPI.getWirelessNetwork() failing ... I've got to admit, it is super embarrassing that a) I didn't notice this when testing and b) no one else has noticed until now.	2017-12-10 15:37:40 +00:00
SquidDev	788d783745	Fix getCollisionBoundingBox not using all AABBs ... Closes #493	2017-11-22 10:52:28 +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	bfb4f88304	Fix the printer clearing the previous page ... When printing on top of an already printed page, the previous contents should be preserved. However, this did not occur as the stack had been shrunk and so the item was no longer considered a printout. Closes SquidDev-CC/ComputerCraft#2	2017-10-06 12:04:49 +01:00
Wilma456 (Jakob0815)	999351e667	Fix io.lines()	2017-10-04 18:51:48 +02:00
Wilma456	4fb0240a36	Changes suggested by SquidDev and update help file	2017-09-24 17:36:20 +02:00
Daniel Ratcliffe	19e4c03d3a	Merge pull request #456 from Wilma456/ioerror ... Set errorlevel for "Unsupported format" to 2	2017-09-22 13:20:34 +01:00
Daniel Ratcliffe	c6b8cb1fab	Merge pull request #458 from SquidDev-CC/hotfix/block-shapes ... Fix BlockFaceShape not being overridden for turtles and peripherals	2017-09-22 13:20:08 +01:00
Wilma456 (Jakob0815)	f20a7afa7f	Better Code	2017-09-18 15:22:44 +02:00
SquidDev	01f5d006fc	Fix BlockFaceShape not being overridden for turtles and peripherals ... This meant one could perform various illogical actions to non-full-blocks, such as connecting fences and placing paitings. We also modify the behaviour of isOpaqueCube and isFullCube for peripherals, only returning false for the case of modems and cables.	2017-09-18 08:33:40 +01:00
Wilma456 (Jakob0815)	f8193a4d23	Set errorlevel for "Unsupported format" to 2	2017-09-16 16:11:36 +02:00
Wilma456	5be2202b2e	Add read() to Filehandle	2017-09-16 16:06:27 +02:00
Wilma456 (Jakob0815)	b8630f739a	Add Check requested by dan200	2017-09-13 19:21:17 +02:00
Daniel Ratcliffe	1c8480a329	Merge pull request #441 from SquidDev-CC/hotfix/paintutils-read ... Fix a non-existent method being used in paintutils	2017-09-13 17:10:07 +01:00
Daniel Ratcliffe	5219648128	Merge pull request #445 from SquidDev-CC/hotfix/container-backgrounds ... Fix background and tooltips not rendering within containers	2017-09-13 00:43:10 +01:00
Wilma456	1415dd0dae	Changes requested by dan200	2017-09-12 20:43:07 +02:00
Daniel Ratcliffe	e959051239	Merge pull request #447 from BombBloke/patch-1 ... Correct minor typo in rednet.receive	2017-09-12 18:14:34 +01:00
Wilma456 (Jakob0815)	373b7ba293	Fix check of write() ... if you call write(nil), you will get the error "bios.lua:229: bad argument: string expected, got nil", so nil is not a valid argument for write() and should be removed.	2017-09-12 17:17:58 +02:00
Bomb Bloke	70c6f3498b	Correct minor typo in rednet.receive ... Caused attempts to set a time-out value to throw "expected number, got number".	2017-09-13 01:06:59 +10:00
Wilma456	5989d021c7	Add folder /rom/modules	2017-09-12 16:44:22 +02:00
SquidDev	baa8993999	Fix background and tooltips not rendering within containers ... The methods to draw these now have to be explicitly called, hence not showing up.	2017-09-12 15:05:32 +01:00
Wilma456 (Jakob0815)	92f5860de6	Use select()	2017-09-12 15:27:09 +02:00
SquidDev	12abd4292e	Fixes a non-existent method being used in paintutils	2017-09-12 09:52:21 +01:00
Daniel Ratcliffe	fa498e74fb	1.80pr1	2017-09-12 00:11:19 +01:00
Daniel Ratcliffe	bd90d7d3b0	Ignore .DS_Store files	2017-09-12 00:05:26 +01:00
Wilma456 (Jakob0815)	0115bc8dca	Make io.write() accept multiple args ... This is just to bring the io API from CC close the the io API from normal lua, which accept multiple args for io.write().	2017-09-11 15:47:30 +02:00
Daniel Ratcliffe	1fdfcdb5f2	Merge pull request #378 from MineRobber9000/patch-3 ... Add ability to load raw data from a string [paintutils]	2017-09-11 13:28:27 +01:00
Daniel Ratcliffe	6c32d8a57e	Merge pull request #394 from Wojbie/bugfix/Filesystem-dots-#35 ... Modify logic behind ... and more in file path.	2017-09-11 13:27:13 +01:00
Daniel Ratcliffe	61ff91f237	Merge pull request #316 from SquidDev-CC/feature/minecraft-1.12.2 ... Update to 1.12. Bam!	2017-09-10 20:52:26 +01:00
SquidDev	3b2de38227	Build against Oracle JDK 8 instead	2017-09-10 20:45:24 +01:00
Daniel Ratcliffe	bde9ac9747	Merge pull request #400 from SquidDev-CC/hotfix/redstone-propagation ... Fix redstone not being propagated through solid blocks	2017-09-10 18:05:51 +01:00
Wojbie	6aa4a385a3	Requested changes to logic behind ... in file path.	2017-09-10 17:51:29 +02:00