1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-05-28 16:32:08 +00:00
Commit Graph

1262 Commits

Author SHA1 Message Date
SquidDev a0e72d02c8 Bump Forge version 2019-08-06 08:33:39 +01:00
SquidDev 455a59ca85 Sure, you can be an actual release now 2019-08-04 17:01:52 +01:00
SquidDev 46d78af068 Fix changelog being out-of-sync v1.12.2-1.84.0 2019-08-04 11:05:44 +01:00
SquidDev 08d22fd3df Fix changelog being out-of-sync v1.14.4-1.84.0 2019-08-04 11:05:14 +01:00
SquidDev e6c691a8f8 Fix rom's location
This isn't going to get annoying or anything
2019-08-04 11:02:07 +01:00
SquidDev 4b0e5c445c Merge branch 'master' into mc-1.14.x 2019-08-04 10:57:20 +01:00
SquidDev eb5cff1045 Alright, let's do this one last time 2019-08-04 09:27:48 +01:00
SquidDev 35c7792aa2 Limit the titles of printed pages
Just enforce the same restrictions as we do for computer/disk labels.
2019-08-04 08:59:44 +01:00
Jonathan Coates 521688d630 Merge pull request #183 from SquidDev-CC/feature/thread-safe-inventories 2019-08-01 14:30:32 +01:00
SquidDev 75e2845c01 Remove synchronized from turtle inventory code
These should never be called off the server thread, so this doesn't make
much difference.
2019-08-01 14:09:57 +01:00
SquidDev 2f96283286 Make disk drives thread-safe 2019-08-01 13:48:03 +01:00
SquidDev cbe6e9b5f5 Make printers thread-safe 2019-08-01 13:48:03 +01:00
SquidDev 2ab79cf474 Version bumps 'n stuff 2019-07-30 15:48:05 +01:00
SquidDev 6ce34aba79 A quick attempt at fixing Travis
Oracle JDK 8 is EOL (I think at least).
2019-07-30 15:25:14 +01:00
SquidDev 5eeb320b60 Include all mods within a resource mount
This is the behaviour on 1.14 already, so it makes sense to backport to
1.12.

Any mod may now insert files into assets/computercraft/lua/rom, and
they'll be automatically added to the default ROM mount. This allows
other mods to easily register new programs or autorun files.

See #242
2019-07-30 15:20:08 +01:00
SquidDev 93310850d2 Use the "cc" module namespace instead of "craftos"
This is what we actually discussed in the issue, and I failed to
remember.
2019-07-27 11:34:59 +01:00
powerboat9 a2880b12ca Do not refuel beyond the turtle limit (#274) 2019-07-24 08:15:02 +01:00
SquidDev cef2657048 Fix turtles being replaced by leaves
And logs. Well, hopefully at least.

Fixes #278
2019-07-21 10:28:22 +01:00
SquidDev ccd85eb055 Bump Forge version 2019-07-21 09:41:58 +01:00
powerboat9 303b57779a Fix turtles harvesting blocks when they shouldn't (#276)
harvestBlock should only be called when removedByPlayer and canHarvestBlock
return true, otherwise we run the risk of causing dupe bugs.

See #273.
2019-07-17 09:23:14 +01:00
SquidDev 6279816ecc Try using the HTTP one instead 2019-07-15 08:45:22 +01:00
SquidDev 4ae77261fa Petty changes because I'm petty 2019-07-13 08:29:28 +01:00
liquid 4b7d843b78 Removed term.getLine 2019-07-13 01:45:16 -05:00
liquid 1c28df65c3 Fixed style errors 2019-07-12 23:56:49 -05:00
liquid 85b740f484 Added term.getLine and window.getLine 2019-07-12 22:54:37 -05:00
SquidDev f9929cb27d Fix the signature of loadfile
Lua 5.2+ uses loadfile(filename, mode, env), not loadfile(filename,
env). While this is a minor incompatibility, it'd be nice to be
consistent as much as possible.

We try to handle the incorrect case too, as obviously we don't want to
break existing programs.
2019-07-12 22:04:28 +01:00
SquidDev bafab1ac07 Expose expect as a module (#267)
This moves expect from the bios into a new craftos.expect module,
removing the internal _G["~expect"] definition. Apparently people were
using this irrespective of the "don't use this" comment, so we need to
find another solution.

While this does introduce some ugliness (having to load the module in
weird ways for programs, duplicating the expect function in memory), it
does allow people to use the function in a supported way, and removes
the global ugliness.
2019-07-09 08:04:49 +01:00
JakobDev e05c262468 Add more tests (#253)
I'm not entirely sure how useful all of these will be yet - still
trying to work out what/when to test things, but hopefully this'll
be a useful datapoint.
2019-07-08 09:24:05 +01:00
SquidDev acfb72246c Bump JEI version 2019-07-07 15:52:52 +01:00
SquidDev 9d51c4c340 Use world-specific collider entity
This is equally an ugly hack, but means we're at least not constructing
entities with null worlds any more.

Ideally we could always use the turtle entity, but this will require a
bit more of a refactor.

Fixes #265
2019-07-05 22:09:42 +01:00
SquidDev 18068effec Use reflection to get the record's sound
getSound is client side only - I could have sworn it became shared at
some point, but that may have been reverted again (or I imagined it).

Fixes #263
2019-07-05 21:51:54 +01:00
SquidDev 7a3f7d3bba I'm a muppet
Even worse, I enabled branch protection for some reason, and so can't
force push and pretend this never happened.
2019-06-29 15:49:14 +01:00
SquidDev 95aa48c456 Allow running expectations against stubbed functions
Co-authored-by: hydraz <urn@semi.works>
2019-06-29 15:37:41 +01:00
SquidDev 6ea8ca991b Bump Forge to 1.14.3
Guess it's time for another release?
v1.14.3-1.83.1
2019-06-26 08:25:32 +01:00
SquidDev f1e551b960 Bump Forge version
Turtle models now work (though texture registration is still broken).
2019-06-23 15:30:29 +01:00
SquidDev 772c54ec74 Copy the item stack before merging
Otherwise we would mutate the stack, and so the current mount was
considered empty. Closes #240 (though would be nice to improve this).
2019-06-21 22:00:21 +01:00
SquidDev 13cb789c18 Fix "can deploy" check being entirely incorrect
Closes #258
2019-06-21 21:51:22 +01:00
SquidDev 42220c4268 Fix several other client-only methods 2019-06-21 21:32:15 +01:00
SquidDev 3052506e2e Reload configs from the file 2019-06-21 21:32:02 +01:00
SquidDev 0741daa7eb Fix usage of a client-only method
Should probably run forge-lint on this at some point, but it's a good
start.

Fixes #255
2019-06-21 21:02:09 +01:00
SquidDev b4aa554279 Do not fetch the current block within onLoad
The chunk has not been fully loaded when onLoad is called, which means
we try to load it again, and so the server deadlocks.
2019-06-21 20:57:38 +01:00
SquidDev 8fe2abe0ae Forward tab key directly to the terminal
Fixes #256
2019-06-21 20:31:28 +01:00
SquidDev 5af789ae11 Bump Forge version 2019-06-21 20:31:17 +01:00
SquidDev 904a168d5c Fix incorrect explosion check
We should block explosions if the turtle is advanced /or/ if it's from
a fireball or entity, not if both.

Fixes #257
2019-06-21 18:53:28 +01:00
JakobDev 724441eddc Change URLs in build.gradle to https (#259) 2019-06-21 16:51:55 +01:00
SquidDev f68ab3edd1 Minor tweaks to build script
Mostly just rearranging. Bump JUnit version in an attempt to fix test
outputs, but it appears this is a mix of gradle/gradle#5975 and
gradle/gradle#4438.
2019-06-15 11:05:45 +01:00
SquidDev 68542aca3a Fix cable breaking rendering
Texture locations have changed a little
2019-06-15 09:19:41 +01:00
SquidDev 594bc4203c Fix block drops for computers and turtles 2019-06-15 09:07:31 +01:00
SquidDev 57318b022d Merge branch 'master' into mc-1.14.x 2019-06-15 08:00:20 +01:00
SquidDev 761159aa93 Bump Forge version 2019-06-15 07:40:27 +01:00