1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-06-04 03:42:07 +00:00
Commit Graph

371 Commits

Author SHA1 Message Date
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
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
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
Wilma456 6fdf38f55f Replaced "no value" with "nil" in ArgumentHelper 2017-07-04 12:44:20 +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
Daniel Ratcliffe 14e4d037ad Merge pull request #317 from Wojbie/Mixed-lua-side-improvements
Multiple fixes and feature fixes for lua side of CC.
2017-06-28 22:25:18 +01:00
Daniel Ratcliffe 28a89a26ad Merge pull request #342 from SquidDev-CC/hotfix/turtle-suck
Replace direct equality with InventoryUtil.areItemsEqual
2017-06-28 22:12:30 +01:00
SquidDev c9a3bcb68b Replace direct equality with InventoryUtil.areItemsEqual
Some IItemHandler.insertItem implementations clone the item, so we must
check whether the object is equal instead.

Fixes #340
2017-06-28 22:11:25 +01:00
Daniel Ratcliffe 025af6a0a0 Merge pull request #329 from Wilma456/pocketequip
Add equip and unequip for Pocket Computers
2017-06-28 22:06:35 +01:00
Wojbie f247879d98 Re-add Colon syntax support to edit. 2017-06-28 23:06:06 +02:00
Wojbie bf533dd00a Reverting requested changes. Take 1
Reverting rewrites to painutils, paint and edit - keept the paste logic change in edit.
Changed and removed misc parts as requested in PR.
2017-06-28 22:58:57 +02:00
Logan Davis 0fb8177721 Fixed possible Typo. (#337) 2017-06-28 21:39:54 +01:00
Daniel Ratcliffe 22066a96dd Merge pull request #335 from Wilma456/shellcheck
Add Checks to Shell and Multishell
2017-06-28 21:20:04 +01:00
Daniel Ratcliffe 836de416bc Merge pull request #334 from Wilma456/colorcheck
Add Checks to Colors API
2017-06-28 21:16:54 +01:00
Wilma456 6bbd1f3718 Add Checks to Textutils API 2017-06-26 15:21:52 +02:00
Wojbie 6255314ba8 Fir error in http.request _post error cheacking code and add package.config to shell require code to support standard better. 2017-06-24 14:33:29 +02:00
Wojbie fc93ee474f Merge branch 'master' into Mixed-lua-side-improvements 2017-06-24 14:29:19 +02:00
Wilma456 13ed933c6b Add Checks to Shell and Multishell 2017-06-23 18:33:11 +02:00
Wilma456 fb5ba01e5a Add Checks to Colors API 2017-06-23 17:38:40 +02:00
Wojbie 7090f6b6a7 Make settings API getNames() function sort names.
Makes it easier for eye and keeps settings from same program next to eachother.
2017-06-23 01:07:18 +02:00
Wilma456 01c024d8b0 Add equip and unequip for Pocket Computers 2017-06-22 14:05:42 +02:00
Wojbie 52a2c6f7f9 Merge pull request #3 from BombBloke/patch-1
Update paintutils.lua
2017-06-21 16:51:09 +02:00
Bomb Bloke d9190f95ec Update paintutils.lua
Couple of fixes, plus let's not use maxn when blitting images after all. Load method ensures it isn't needed.
2017-06-21 23:41:40 +10:00
Wojbie 6df22235ae Add forgotten settings.set in bios. 2017-06-20 02:09:28 +02:00
Daniel Ratcliffe 174b63d59a Merge pull request #309 from Wilma456/execcom
Add autocompletion to exec
2017-06-19 20:44:21 +01:00
Daniel Ratcliffe f0257028ba Merge pull request #321 from Wilma456/bioscheck
Add Checks to Bios
2017-06-19 19:18:14 +01:00
Daniel Ratcliffe 4a9f1e013c Merge pull request #324 from BombBloke/patch-1
Fix Bug with peripheral.find()
2017-06-19 19:17:02 +01:00
Bomb Bloke a7db108762 Update paintutils.lua 2017-06-19 13:46:13 +10:00
Bomb Bloke be861a1c0d Fix Bug with peripheral.find()
Since #315 peripheral.find() doesn't work. This PR fix this.
2017-06-19 13:09:06 +10:00
Wojbie 1489da1f5f Adds support for colon operator in complete() function.
Includes changes to lua and edit programs to correctly support that too.
2017-06-19 01:15:26 +02:00
Wilma456 c70acbb05a Add Checks to Bios 2017-06-18 17:48:07 +02:00
Wojbie 7e08662b95 Assorted fixes to rednet, textutils, gps, chat.
As reported by @SquidDev.
2017-06-18 17:12:08 +02:00
Daniel Ratcliffe 93d1facbab Merge pull request #320 from Wilma456/perifix
Fix Bug with peripheral.find()
2017-06-18 15:07:18 +01:00
Wilma456 4580f10567 Fix Bug with peripheral.find() 2017-06-18 15:58:06 +02:00
Wojbie 06b2f3511f Update paintutils.lua
Make error messages consistent with new system.
Fix some type errors and fix problem noticed by @BombBloke.
2017-06-18 12:03:14 +02:00
Wojbie 3acbdb2f90 Merge branch 'master' into Mixed-lua-side-improvements 2017-06-17 22:21:25 +02:00
Wojbie 01a0ce3dd0 Implements suggested changes. 2017-06-17 22:14:04 +02:00
Daniel Ratcliffe bfb682bef9 Merge pull request #315 from SquidDev-CC/feature/argument-validation
Rewrite argument validation
2017-06-17 19:25:20 +01:00
Daniel Ratcliffe 9b5aa43d95 Merge pull request #319 from Wilma456/defread
Add Default to read()
2017-06-17 19:18:27 +01:00
Wojbie efb351e1b0 Modification of edit.lua to use blit in writeHighlighted
Reduces amount of string operations and write calls inside writeHighlighted function by switching it to blit and using the 3rd argument in string.match.
2017-06-16 23:13:53 +02:00