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.
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
Noktuska
3fb7b47278
Fixed Beekeeper module not working with GT IApiary
2024-03-25 03:41:04 +01:00
Noktuska
6681bf9438
Fixed Beekeeper module not working with GT IApiary
2024-03-22 03:13:41 +01:00
Martin Robertz
fe2f6fc51f
update
2024-03-02 10:44:58 +01:00
Jason Mitchell
a8c255a10d
If we say it's thread safe, that makes it true -- right? right? ( #117 )
...
* If we say it's thread safe, that makes it true -- right? right?
* Threadsafe PatchedRenderBlocks
* Make 3d printed blocks threadsafe
2024-03-01 12:57:45 -08:00
Raven Szewczyk
9299673622
[ci skip] upgraded build system
2024-02-04 20:00:54 +00:00
Martin Robertz
0068b8feb3
update deps
2024-01-10 00:11:30 +01:00
bombcar
913b81fd74
[bs] update dependencies ( #115 )
...
* update repositories
* update deps
2024-01-08 18:14:46 -06:00
Martin Robertz
61415df3a2
update nei
2024-01-08 23:15:03 +01:00
Martin Robertz
89e2d466ec
update bs
2024-01-08 23:06:38 +01:00
Martin Robertz
c2851f35fa
update deps
2024-01-08 22:35:01 +01:00
Raven Szewczyk
e780cbde11
[ci skip] upgraded build system
2024-01-08 21:28:18 +00:00
bombcar
fbe4427dca
Correctly store the OC version in the config file ( #114 )
...
* fix extraneous @VERSION@
* don't doublecopy
* spotless don't gradle
2024-01-08 13:23:32 -06:00
Martin Robertz
a33c483a72
update bs+deps
2024-01-02 11:11:09 +01:00
Martin Robertz
43ed78121a
Merge pull request #113 from GTNewHorizons/fix/ae2-integration
...
Fix AE2 Integration
2024-01-02 10:15:04 +01:00
Pelotrio
cec0babb96
Fix AE2 Integration
2023-12-31 17:16:34 +01:00
Martin Robertz
9ad6dd0772
Merge pull request #110 from ghostflyby/bee_convert
...
Bee convert should not be localized
2023-12-29 13:02:07 +01:00
Martin Robertz
0a8fdaac72
Merge pull request #112 from GTNewHorizons/fix-version
...
Fix Coremod Version
2023-12-29 00:33:54 +01:00
glowredman
fab9ca5303
Don't inject @VERSION@
2023-12-29 00:25:11 +01:00
glowredman
63eb0495c9
Fix coremod version
2023-12-28 23:21:22 +01:00
Martin Robertz
646db1fcb6
Merge pull request #111 from GTNewHorizons/fix/unhandled-side
...
Fix unhandled side for redstone connection
2023-12-18 15:45:31 +01:00
Alexander Anishin
b8a620c9a4
Converted GregTech recipes to RA2
2023-12-18 17:19:46 +03:00
Martin Robertz
61dac8a440
update deps
2023-12-18 13:06:00 +01:00
Alexander Anishin
d54d2a2742
Updated build script
2023-12-18 12:21:28 +03:00
