Adrian Siekierka
ca76c81b32
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2022-06-08 20:00:08 +02:00
Adrian Siekierka
6aee1d645f
#3509 fix ByteBufInputStream memory leak
2022-06-08 19:59:27 +02:00
Adrian Siekierka
01880299b6
fix incorrect 3D print lighting on 1.12, close #3472
2022-06-08 19:49:51 +02:00
Adrian Siekierka
a87c2a404d
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2022-06-08 19:43:25 +02:00
Adrian Siekierka
6a8cb64f46
Javadoc fixes, close #3445
2022-06-08 19:36:50 +02:00
payonel
acd1453af9
Merge 'origin/master-MC1.7.10' into master-MC1.12
2022-06-08 08:07:58 -07:00
Skye
9d2d619e41
Make Lua BIOS take use tail call optimisation
...
I am not sure if this will do much, but for the sake of completeness I think it would be a good idea to do this.
2022-06-08 07:30:18 -07:00
payonel
3df002f4af
#3499 edit fix: floor cursor positions passed to setCursor. note that this could be done in tty but trying to reduce impact of this change
2022-06-08 06:58:48 -07:00
Adrian Siekierka
63e140bd6d
GitHub Actions: different artifact layout for 1.12 OC
2022-06-08 00:39:52 +02:00
Adrian Siekierka
51481f12c7
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2022-06-08 00:24:59 +02:00
Adrian Siekierka
fb73d37474
build.gradle: fix Git reference appending
2022-06-08 00:23:09 +02:00
Adrian Siekierka
46940732df
update to ForgeGradle 5.1
2022-06-08 00:18:06 +02:00
Adrian Siekierka
9565d8f60f
update GitHub Actions, save build JARs for builds
2022-06-07 23:49:43 +02:00
Adrian Siekierka
d69bb1ef3d
update to Forge 2847, update mappings
2022-06-07 23:46:30 +02:00
Adrian Siekierka
8000ef5f4e
update GitHub Actions, add Modrinth uploads
2022-06-07 23:43:09 +02:00
Adrian Siekierka
babd9ae917
build.gradle: increase Scala worker memory limit to 1GB
2022-06-07 23:28:56 +02:00
Adrian Siekierka
dc6ff2cc50
add GitHub Actions
2022-06-07 20:59:47 +02:00
Adrian Siekierka
fa0ff09dd2
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2022-06-07 17:45:14 +02:00
Adrian Siekierka
52bf04383e
update build scripts, mod dependencies
2022-06-07 17:43:10 +02:00
Adrian Siekierka
7d9d18c372
Fix inconsistent 3D print item stacking
...
Now prints that consist of the same set of shapes stack as they should.
Co-authored-by: Quant1um <spitfirexv22@gmail.com>
2022-06-07 17:39:19 +02:00
Adrian Siekierka
631ef13cab
add missing null NBT check in Blood Magic integration
2022-06-07 17:30:26 +02:00
JamesOrdner
12922927ab
Fixed Relay setStrength unlimited upper bound ( #3265 )
2022-06-07 17:07:43 +02:00
Adrian Siekierka
23d218d598
update font to unscii 2.1 + funscii patches + unifont 14.0.04 (thanks to the OFL license option)
2022-06-07 17:03:49 +02:00
Adrian Siekierka
46af180594
fix handling block GUIs for larger/negative Y values, see #3494
...
This is particularly useful not just for Cubic Chunks, but for potential future
post-1.12 ports making use of the changes in world height.
2022-06-07 16:17:56 +02:00
Adrian Siekierka
a821ae02a8
add null check to GregTech data stick NBT, closes #3336
2022-06-07 16:16:21 +02:00
Adrian Siekierka
21477efb77
update build scripts, mod dependencies; fix EIO/PR wrench comptibility
2022-06-07 16:09:53 +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
