5648 Commits

Author SHA1 Message Date
Dream Master
8e1c98dfc7
update 2024-07-30 23:49:01 +07:00
Dream Master
26abe7d634
update 2024-07-30 23:48:26 +07:00
Demiu
4bcfb14fa4 Adjust to AE2 api changes 2024-07-26 21:49:56 +02:00
Dream Master
2cb4be5994
update 2024-07-14 00:04:33 +07:00
Martin Robertz
e3fa228859
Merge pull request #126 from Engineer12798/feat/reactor-heat-storage
IC2: Add converter for reactor components to get stored heat.
2024-07-11 13:23:27 +07:00
Engineer12798
5c3cc8e736 Merge remote-tracking branch 'refs/remotes/origin/master' into feat/reactor-heat-storage 2024-07-10 19:24:51 -04:00
Engineer12798
65a653f910 Revert "Add converter for heat storing IC2 reactor components."
This reverts commit 97a0922bea3224a41072d443c4989c538333c348.
2024-07-10 19:21:12 -04:00
Engineer12798
4ba797d5bf Revert "Fixed issue with getting heat from GT Cells due to creative decision regarding canStoreHeat"
This reverts commit dd69c680e52e66d7a2b2f4dd3062e883584788d4.
2024-07-10 19:21:12 -04:00
Engineer12798
64505555f9 Add getSlotInfo to reactor driver, to get item heat. 2024-07-10 11:01:20 -04:00
Martin Robertz
6b9b22c375
Merge pull request #125 from Georggi/addFasterAENetworkAccess
AE2: Added a faster method to filter items from ME network
2024-07-09 21:53:01 +07:00
Martin Robertz
2b208f58ba
Merge branch 'master' into addFasterAENetworkAccess 2024-07-09 21:45:16 +07:00
Dream Master
662e421238
update 2024-07-09 21:33:39 +07:00
Engineer12798
dd69c680e5 Fixed issue with getting heat from GT Cells due to creative decision regarding canStoreHeat 2024-07-08 23:57:27 -04:00
Engineer12798
97a0922bea Add converter for heat storing IC2 reactor components. 2024-07-08 23:54:13 -04:00
Martin Robertz
a7ac71fdf2
Merge pull request #124 from clzola/feature/ic2-fluid-reactors
Adds method to get Fluid Reactor's Heat output
2024-06-29 16:27:19 +02:00
Yurii Shnitkovskyi
a0393127f5 AE2: feat: Added a faster method to filter items from ME network 2024-06-28 16:43:41 +03:00
clzola
3ea5586b13 Returns 0 for fluid reactor's emitted heat as a fallback value 2024-06-11 12:37:44 +02:00
clzola
ceee3fff16 Adds getEmitHeat() method to DriverReactorRedstonePort in order to get fluid reactor's heat output. 2024-06-10 22:31:32 +02:00
Martin Robertz
2c0252556c
update 2024-04-19 19:01:55 +02:00
Raven Szewczyk
96f2264a48
Merge pull request #122 from asiekierka/gtnh-oc-1.8.5
Upstream merge - OpenComputers 1.8.5
2024-04-19 14:05:47 +01:00
Adrian Siekierka
74518e0c1e Merge branch 'master-MC1.7.10' into HEAD 2024-04-19 14:42:46 +02:00
Adrian Siekierka
ad76e2a54a fix #3710 1.7.10-forge/1.8.5 2024-04-19 14:37:02 +02:00
Raven Szewczyk
4f8033c86a
Merge pull request #121 from asiekierka/gtnh-oc-1.8.4
Upstream merge - OpenComputers 1.8.4
2024-04-16 19:11:35 +01:00
Adrian Siekierka
6da96e644d Merge branch 'master-MC1.7.10' into gtnh-oc-1.8.4 2024-04-16 19:01:04 +02:00
Adrian Siekierka
479b3012b9 fr_FR: Undo more of the EEPROM -> BIOS rename, avoid translating mod names. 1.7.10-forge/1.8.4 2024-04-16 18:52:11 +02:00
Adrian Siekierka
1354ff5f90 Update changelog. 2024-04-16 18:42:12 +02:00
Adrian Siekierka
9d4f7ea297 Fix pcall()/xpcall() bug. 2024-04-16 18:39:11 +02:00
Adrian Siekierka
3ceac7077b Work around #3663 - allow response.response() to work for failed HTTP connections 2024-04-13 09:58:10 +02:00
Martin Robertz
172aad5b37
update 2024-04-07 15:30:10 +02:00
Adrian Siekierka
53efb9c28c fr_FR: Undo EEPROM -> BIOS rename. 2024-04-07 15:11:34 +02:00
ff66theone
3a8487610e
Update fr_FR.lang (#3652)
* Update fr_FR.lang

Modified some terms that weren't the same in some places
Deleted spelling mistakes

* Update Settings.scala

Add temperature values

* Update application.conf

Added temperature-related config

* Revert "Update application.conf"

This reverts commit 0cd7cfc29bfb49bedc8a9100a606001845603cfa.

* Revert "Update Settings.scala"

This reverts commit f53a080ca70e546d393f94bc91e9cb0c0e5aecb4.

* Update index.md

Removed some spelling mistakes

* Update adapter.md

Removed two more spelling mistakes

* Update assembler.md

Removed more spelling mistakes

* Update cable.md

Added forgotten words<br>
Translated the "cover" term

* Update capacitor.md

Changed "capaciteur" term into "batterie" because "capaciteur" doesn't exist in french

* Update capacitor.md

Forgot one word to correct
2024-04-07 14:24:56 +02:00
Raven Szewczyk
5a357ca274 Update the buildscript 2024-04-07 12:28:10 +01:00
Raven Szewczyk
48216c7594
Merge pull request #120 from asiekierka/gtnh-oc-1.8.4-20240407
Minor fixes from upstream, part 2
2024-04-07 12:23:38 +01:00
Adrian Siekierka
dcb6c294ac Merge branch 'master-MC1.7.10' into gtnh-oc-1.8.4-20240407 2024-04-07 13:18:48 +02:00
Adrian Siekierka
d3bc992ffc Fix changelog missing comma. 2024-04-07 13:18:38 +02:00
Raven Szewczyk
ccf61a1c52
Merge pull request #119 from asiekierka/gtnh-oc-1.8.4-20240407
Minor fixes from upstream
2024-04-07 12:13:59 +01:00
Adrian Siekierka
2e582b291f Merge branch 'master-MC1.7.10' into gtnh-oc-1.8.4-20240407 2024-04-07 13:13:16 +02:00
Adrian Siekierka
6950d6f755 Update font, changelog. 2024-04-07 13:07:07 +02:00
Adrian Siekierka
31dff6e92a OpenOS: implement package.searchers, make package.preload implementation more conformant 2024-04-07 12:51:18 +02:00
Robert Cochran
dde8337955
OpenOS: /lib/package.lua: add support for preload and config (#3447)
Add basic implementations of package.preload and package.config,
necessary to get the Fennel compiler ( https://fennel-lang.org )
running.
2024-04-07 12:16:42 +02:00
Adrian Siekierka
3b60e93af5 Add support for querying aspects in Thaumcraft wands, close #3524 2024-04-07 12:13:19 +02:00
Adrian Siekierka
9d2b2d07bd Merge branch 'master-MC1.7.10' into gtnh-oc-1.8.4-20240407 2024-04-07 11:51:14 +02:00
Adrian Siekierka
15eb13ac14 Update changelog. 2024-04-07 11:43:03 +02:00
Adrian Siekierka
a8fdfee654 fix #3664 2024-04-07 11:10:48 +02:00
Christopher Head
690e8d743c Fix screen turnOn/turnOff return value docs (#3698)
These component method calls actually both return two booleans, but only
the first one was documented.
2024-04-07 10:14:25 +02:00
Adrian Siekierka
2b0b6f9b9f Avoid translating text which does not have a translation key - fix #3677 2024-04-01 15:45:14 +02:00
Jann Stute
b3f3d0a42b
Improved documentation for network floppy (#3691)
* add man page for nc

* fix typo

* add man page for arp

* add man page for route
2024-04-01 15:23:14 +02:00
Martin Robertz
ca6f4ce76c
update 2024-03-25 18:28:04 +01:00
Martin Robertz
6d8e8dd17d
Merge pull request #118 from Noktuska/beekeeper-fix
Fix Beekeeper module not working with GT IApiary
2024-03-25 09:16:10 +01:00
Martin Robertz
20be9ea622
Update dependencies.gradle 2024-03-25 08:36:47 +01:00