AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-09 07:15:11 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,704 Commits 29 Branches 143 Tags
Commit Graph

6704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Siekierka
52bf04383e update build scripts, mod dependencies 2022-06-07 17:43:10 +02:00
Sangar
8155039146
Merge pull request #3449 from SanAndreasP/master-MC1.12 
reversed comparison logic of length check within RedstoneAware:getOutput()
 2021-12-27 16:37:03 +01:00
SanAndreasP
178ad0131f
Update RedstoneAware.scala 
comparison should be checking if array length is bigger than and *not* equal to the ordinal
 2021-12-27 11:34:54 +01:00
SanAndreasP
59d63fe57e
reversed comparison logic of RedstoneAwares' getOutput() length check, fixes #3439 2021-06-15 18:48:07 +02:00
payonel
451093fe3f Merge branch 'master-MC1.10' into master-MC1.12 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala
 2021-05-14 19:12:27 -07:00
payonel
0f3feaed3c Merge branch 'master-MC1.7.10' into master-MC1.10 2021-05-14 19:08:08 -07:00
payonel
e38c3fd308 check tag info for bucket compare on remove 2021-05-14 19:01:11 -07:00
payonel
c2a5874f45 Merge branch 'master-MC1.10' into master-MC1.12 2021-05-14 18:53:14 -07:00
payonel
1f00e7ac04 Merge branch 'master-MC1.7.10' into master-MC1.10 2021-05-14 17:50:36 -07:00
payonel
acd384b7b7 refactor generator upgrade for robustness 2021-05-14 17:41:19 -07:00
payonel
9d2754fd9a working on the merge, needs testing still 2021-05-14 13:13:59 -07:00
payonel
a3f2a436c2 Merge branch 'master-MC1.10' into master-MC1.12 2021-05-13 09:57:43 -07:00
payonel
22e06d6575 Merge branch 'master-MC1.7.10' into master-MC1.10 2021-05-13 07:20:44 -07:00
payonel
1178a90f80 in case held item updates INHAND (e.g. milking a cow) move it to our offhand buffer as our agent code expects 
closes #3200
 2021-05-13 06:49:49 -07:00
payonel
278e7bdbef add address key check in item Delegator to limit max stack size to 1 
closes #3226
 2021-05-13 05:44:19 -07:00
payonel
ff3c2f51a9 implement getInventoryStackLimit for Disassembler to limit transfers from the transposer (and other possible api calls) 
closes #3247
 2021-05-12 19:10:38 -07:00
payonel
41a6b8ac96 generator fixes and change in behavior 
1. insert now puts a single container back in the inventory. this is not fully ic2 fuel cell compatible, you'll lose fuel cells. :)
2. remove requires container if fuel has container type
3. count returns 2nd value, the item name
closes #3391
 2021-05-12 09:22:40 -07:00
payonel
4a50b50725 fix raw set fg and bg methods for row, col, and even the color fields. closes #3401 2021-05-12 07:21:54 -07:00
payonel
90be0181bc args drop returns scala iterator, no need to cast again, toArray will work 
closes #3159
 2021-05-11 13:03:41 -07:00
payonel
a1d1834597 seems onLoaded from ic2 can call oc before traits are ready. this probably closes #3187 2021-05-11 09:33:36 -07:00
payonel
9bb7b69528 allow orphaned coroutines to function. they could be referenced in detached threads. closes #3423 2021-05-11 09:08:12 -07:00
kebufu
481ae2f91a Update zh_CN.lang 2021-05-11 08:32:22 -07:00
Guilherme Puida
1a9feabed7 pt_BR translation update 2021-05-11 08:31:29 -07:00
payonel
7928f0c67f fix remote terminal missing causing null exception. closes #3249 2021-05-11 08:10:39 -07:00
Fingercomp
59fac9b4b6 Check the channel is set before submitting it to the TCPNotifier 2021-05-10 14:41:51 -07:00
zhou2008
e63d90a1cb Update zh_CN.lang 
改进
 2020-10-02 09:37:03 -07:00
David Cook
af2db43c53 Block 0.0.0.0/8 from internet card by default 
The 0.0.0.0/8 subnet refers to "this network", (c.f. RFC 3330) and in
particular, 0.0.0.0 can be used to refer to the local computer. As such,
it should be blocked by default, as loopback addresses currently are.

This default configuration was relevant to a challenge in the ALLES! CTF
2020 competition, see https://play.allesctf.net/tasks/ALLES!Craft or
https://ctftime.org/event/1091. The challenge involved multiple servers
interconnected with Waterfall as a proxy, to enable server
teleportation. The solution to the challenge was to use an internet card
on one of the servers to connect to 0.0.0.0, bypassing the Waterfall
proxy, and replay or reverse proxy a Minecraft handshake in Lua, which
allowed spoofing as a different user.
 2020-09-08 01:58:54 -07:00
PrismaticYT
f74d7d230e Fix five-year-old typo 2020-08-08 21:11:20 -07:00
payonel
f73dd9eaca allow numbers in gsub pattern, as lua does 
closes #1999
 2020-06-07 16:46:15 -07:00
payonel
a84506b860 vt ABCD default is 1 
closes #3320
 2020-06-07 15:05:11 -07:00
payonel
8b8ddb2319 Merge branch 'master-MC1.10' into master-MC1.12 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/gregtech/ModGregtech.scala
#	src/main/scala/li/cil/oc/integration/thaumicenergistics/ModThaumicEnergistics.scala
 2020-06-06 21:12:44 -07:00
payonel
b23c430747 Merge branch 'master-MC1.7.10' into master-MC1.10 2020-06-06 21:11:42 -07:00
payonel
f74af9cafe send palette change update 2020-06-06 21:05:37 -07:00
repo_alt
1cf0910937 Distillation pattern aspect information 2020-06-06 18:02:00 -07:00
repo_alt
172cb07945 Added Seismic Prospector data reading support 2020-06-06 18:00:44 -07:00
payonel
0ac18d3210 update projectred dependency with oc 
max out the forge version that appears to work with building our scala code
 2020-06-06 17:55:27 -07:00
Fingercomp
ab13cec942 Rewrite the ru_RU translation of a manpage 2020-06-04 15:13:06 -07:00
payonel
6a9e2d32bb updating nei and forge in build for dev 2020-06-01 01:06:53 -07:00
payonel
c0aac695be Merge branch 'master-MC1.10' into master-MC1.12 
# Conflicts:
#	src/main/scala/li/cil/oc/server/PacketHandler.scala
 2020-05-31 22:47:59 -07:00
payonel
c820279a63 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/server/PacketHandler.scala
#	src/main/scala/li/cil/oc/server/fs/FileSystem.scala
 2020-05-31 14:41:32 -07:00
payonel
cd0f9fa731 fixed the floppy gui to update its buttons 
and cleaned up the packet handler to make sure reads are done regardless of outcome
 2020-05-31 01:32:59 -07:00
payonel
61ad60b973 1.12 update: added sticky piston upgrade. shapeless craft piston upgrade with a slime ball 
closes #1262
 2020-05-30 21:11:39 -07:00
payonel
f17d790e4c super duper AE2 integration fixes and new api support 
added"

    me_controller.isNetworkPowered
        function():boolean -- True if the AE network is considered online
    me_controller.getEnergyDemand
        function():number -- Returns the energy demand on the AE network
    craftable.requesting
        function():number -- Returns the number of requests in progress.

        Please note, this is on the craftable object returned by getAllCraftables() and NOT the crafting status object you get back from craftable.request(). The reason here is because of AE, the api gives us data about the crafting type and its current outstanding craft requests, but not on a specific job.

    crafting_status.cancel
        function():boolean -- Cancels the request. Returns false if the craft cannot be canceled or nil if the link is computing

        This new api is on the crafting status response object you get from crafting.request(), that is the job status, and you can cancel the job

closes #3274
 2020-05-26 12:59:39 -07:00
payonel
91847a44e5 pass wget user-agent, in a special opencomputers way 
closes #3305
 2020-05-24 02:32:36 -07:00
payonel
bc64f64efe allow process exception handler to print error to stderr - as in some cases the user wants to know about these crashes; such as out-of-memory 
closes #3308
 2020-05-24 02:19:24 -07:00
payonel
012f55a7fa Merge branch 'master-MC1.10' into master-MC1.12 
# Conflicts:
#	src/main/resources/assets/opencomputers/lang/en_US.lang
#	src/main/scala/li/cil/oc/Localization.scala
#	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
#	src/main/scala/li/cil/oc/common/init/Items.scala
#	src/main/scala/li/cil/oc/server/component/GraphicsCard.scala
#	src/main/scala/li/cil/oc/server/component/Trade.scala
 2020-05-24 01:40:10 -07:00
payonel
8689b7479f Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/client/gui/Rack.scala
#	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
#	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
#	src/main/scala/li/cil/oc/server/component/DebugCard.scala
#	src/main/scala/li/cil/oc/server/component/Trade.scala
 2020-05-24 01:16:27 -07:00
payonel
7b078ada5b use rawequal for internal table checks in machien.lua 
thanks bauen1
 2020-05-24 00:42:20 -07:00
payonel
e0f42c30ee rename color_bytes to colors 2020-05-24 00:35:51 -07:00
payonel
af9a34a6af fixed mixed tier gpu and screen bitblt 2020-05-23 23:45:01 -07:00