6759 Commits

Author SHA1 Message Date
Adrian Siekierka
fe5ba4e270 Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12 1.12.2-forge/1.7.6 2022-08-28 19:49:10 +02:00
Adrian Siekierka
011ec73cbb fix github actions upload 2022-08-28 19:47:19 +02:00
Adrian Siekierka
227bf52ebb fix modrinth upload 2022-08-28 19:45:33 +02:00
Adrian Siekierka
4d4d1db34a Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12 2022-08-28 18:10:22 +02:00
Adrian Siekierka
e84596e522 fix gtnh-found null fluid tank info crash 1.7.10-forge/1.7.6 2022-08-28 10:47:31 +02:00
Adrian Siekierka
33eb8cb7fd fix #3540, update changelog 2022-08-28 10:14:31 +02:00
payonel
e86201d116 Use max instead of min to allow configuring max machine signal queue size. closes #3084 2022-08-27 10:48:25 -07:00
Adrian Siekierka
dd0a94a580 Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12 2022-08-27 12:22:49 +02:00
Adrian Siekierka
33a405f899 Update changelog, bump version to 1.7.6. 2022-08-27 12:22:29 +02:00
Adrian Siekierka
0b5de857a7 Merge branch 'master-MC1.7.10' into master-MC1.12 2022-08-27 11:16:21 +02:00
Adrian Siekierka
352e75603c fix #3182 by passing inventory source to transposer.getInventoryName 2022-08-24 03:19:58 -07:00
Adrian Siekierka
b2831fc2e0
Merge pull request #3531 from repo-alt/feature/extend_debug_statment
Add dimension to machine position debug statements
2022-06-24 21:44:37 +02:00
repo_alt
5065044b74 moved machinePosition() to MachineHost 2022-06-24 12:10:19 +04:00
D-Cysteine
e940d5c745 Add dimension to machine position debug statements 2022-06-21 21:20:16 +04:00
Adrian Siekierka
6f8bfbf188
Merge pull request #3527 from lunaboards-dev/patch-2
Add Zone of Endless (Ace Combat)
2022-06-18 12:34:44 +02:00
lunaboards-dev
b1f37cda1f
Add Zone of Endless (Ace Combat) 2022-06-17 20:35:12 -05:00
Adrian Siekierka
b823414447 fix 1.12.2 build 2022-06-13 16:52:12 +02:00
Adrian Siekierka
b4c7bfeed8
Merge pull request #3360 from Low-power/update-chanese-translations-mc1.7.10
Update and improve Chinese translations
2022-06-12 13:18:42 +02:00
TeraV
fed59c5855 Added robot names from Mystery Science Theater 3000 2022-06-11 18:58:37 -07:00
Adrian Siekierka
35006787ba AE2: Fix item stack sizes larger than 2^31-1 2022-06-11 19:53:45 +02:00
Adrian Siekierka
61f5578122 AE2: Fix filtering by keys which are not always present. 2022-06-11 19:51:54 +02:00
Adrian Siekierka
40ae359521 Implement media() on server disk drive, fix #3440 2022-06-11 19:41:13 +02:00
Adrian Siekierka
ec645572f5 #3481 fix 1.12 AE2 power grid initialization race condition 2022-06-11 15:23:45 +02:00
Adrian Siekierka
7d23e7ff99 Remove canEntityDestroy check from OC Player agent. (#3239) 2022-06-11 14:05:10 +02:00
payonel
c9530ae0dd fix env pass in sh command. closes #3196 2022-06-08 23:10:49 -07:00
Adrian Siekierka
eb2619b6de better handle buggy IItemHandlers 2022-06-08 20:20:32 +02:00
Adrian Siekierka
318d82092c Merge remote-tracking branch 'bibo38/fixextract' into master-MC1.12 2022-06-08 20:15:19 +02:00
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