473 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
SquidDev	f8487d1e1c	Merge pull request #453 from SquidDev-CC/ComputerCraft/hotfix/eager-remove-te ... Remove tile before calling destroy	2017-11-14 21:15:47 +00:00
SquidDev	b6f773ffce	Merge pull request #457 from SquidDev-CC/ComputerCraft/hotfix/computer-reload ... Turn on ServerComputer instances if they have timed out	2017-11-14 21:14:49 +00:00
SquidDev	c8673473ef	Merge pull request #476 from SquidDev-CC/ComputerCraft/hotfix/printer-clear ... Fix the printer overwriting the current page	2017-11-14 21:14:10 +00:00
SquidDev	3829815756	Merge pull request #479 from SquidDev-CC/ComputerCraft/feature/network-optimisations ... Only send terminal state to interacting players	2017-11-14 21:13:17 +00:00
SquidDev	7eac8faf0d	Merge pull request #482 from SquidDev-CC/ComputerCraft/feature/jei-integration ... Add simple JEI integration	2017-11-14 21:06:02 +00:00
SquidDev	d9d025e33b	Add simple JEI integration ... - Ensure pocket computers and turtles are distinguished by upgrades and computer family. - Ensure disks are distinguished by colour. - Hide treasure disks from the list	2017-10-25 13:40:35 +01:00
SquidDev	53f16782ab	Only send terminal state to interacting players ... This splits the computer state (blinking, label, etc...) and terminal state into two separate packets. When a computer changes, the computer state is sent to all players and the terminal state is sent to players who are curerntly using the computer. This reduces network usage by a substantial amount.	2017-10-12 10:45:38 +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
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
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
SquidDev	cd6b076efe	Turn on ServerComputer instances if they have timed out	2017-09-16 20:09:51 +01:00
Wilma456 (Jakob0815)	f8193a4d23	Set errorlevel for "Unsupported format" to 2	2017-09-16 16:11:36 +02:00
SquidDev	60305cd106	Remove tile before calling destroy ... This ensures that the tile will updating neighbouring blocks, and so the destroyed tile will not be wrapped as a peripheral.	2017-09-15 17:40:53 +01: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
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
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
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
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
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
SquidDev	a2da6d9601	Pass the original block in redstone propagation ... notifyBlockOfStateChange and notifyNeighborsOfStateExcept expect the block which caused the redstone update, rather than the neighbor block. Fixes #393	2017-09-10 09:32:02 +01:00
Daniel Ratcliffe	88b1124204	Merge pull request #399 from SquidDev-CC/hotfix/http-encoding ... Fix setting an invalid content-encoding header	2017-09-10 00:28:39 +01:00
Daniel Ratcliffe	51644e32ed	Merge pull request #415 from Wilma456/palletecheck ... Add valid check to term.setPaletteColor/getPaletteColor	2017-09-10 00:12:46 +01:00
Daniel Ratcliffe	cf5216aefb	Merge pull request #401 from SquidDev-CC/hotfix/peripheral-errors ... Fix logPeripheralErrors not being set	2017-09-10 00:06:15 +01:00
Daniel Ratcliffe	c7e5386e80	Merge pull request #414 from Wilma456/listfix ... Fix Bug in list.lua	2017-09-10 00:04:08 +01:00
Daniel Ratcliffe	707f0899da	Merge pull request #429 from Wilma456/iofix ... Fix io API	2017-09-09 23:59:57 +01:00
Daniel Ratcliffe	3095a6bbad	Merge pull request #241 from SquidDev-CC/feature/minecraft-1.11.2 ... Update to 1.11.2	2017-09-09 23:54:42 +01:00
Wilma456 (Jakob0815)	a5bbed528d	Make mode from io.open() accept nil	2017-09-06 18:53:44 +02:00
Wilma456 (Jakob0815)	369be7c32c	Fix io API ... While adding checks to the io API in #424, I had forgot that the io API has his own type() function who overwrite the default one. This PR fix this. Sorry for that.	2017-08-27 17:08:40 +02:00
Daniel Ratcliffe	fd8837c631	Merge pull request #377 from Wilma456/fserror ... Better Errors for fs API	2017-08-27 13:51:36 +01:00
Daniel Ratcliffe	2f829a1413	Fixed load() not accepting function arguments	2017-08-27 13:34:33 +01:00
Daniel Ratcliffe	0de3a42808	Merge pull request #424 from Wilma456/newcheck ... Add more Checks	2017-08-27 12:26:58 +01:00
Daniel Ratcliffe	2fb6a9dc62	Merge pull request #389 from Wilma456/ioerr ... Make io.open() return Error	2017-08-27 12:22:54 +01:00
Daniel Ratcliffe	87b771b7c8	Merge pull request #421 from Wilma456/sleephelp ... Remove sleep.txt	2017-08-27 12:17:53 +01:00
Wilma456	79697e37b0	Add Check to load()	2017-08-24 20:18:21 +02:00
Wilma456	4f9de6b02c	Update Checks	2017-08-24 20:17:31 +02:00
Wilma456	e9cea7d0f5	Add more Checks	2017-08-21 15:20:32 +02:00
Wilma456 (Jakob0815)	90626748e4	Remove sleep.txt ... sleep was removed from CC, so It's time to remove the help file	2017-08-18 15:45:57 +02:00
Wilma456 (Jakob0815)	30b55d966b	Add valid check to term.setPaletteColor/getPaletteColor	2017-08-11 15:38:02 +02:00
Wilma456 (Jakob0815)	3371345fad	Fix Bug in list.lua ... list.lua check now, if sDir is a Directory	2017-08-11 13:42:20 +02:00
SquidDev	8f6feff4fd	Fix logPeripheralErrors not being set	2017-08-01 21:25:23 +01:00
SquidDev	26bca2e109	Fix setting an invalid content-encoding header	2017-07-31 07:50:23 +01:00