Possseidon
c053c0f531
Fixed OpenOS diagnostics in the vscode Lua plugin.
2023-06-03 15:54:39 +02:00
Adrian Siekierka
4bc3641988
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2023-06-03 15:38:01 +02:00
Adrian Siekierka
66bd036ed9
somewhat mimic Lua 5.3+ conversion logic for numbers in API arguments, fix #3620
2023-06-03 15:37:49 +02:00
Adrian Siekierka
d9204b81e2
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2023-05-30 21:14:20 +02:00
Adrian Siekierka
c71c1479dd
Lua 5.3+ fixes
2023-05-30 21:12:53 +02:00
Adrian Siekierka
462dec177c
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2023-05-30 20:47:21 +02:00
Adrian Siekierka
1c163dd701
un-revert application.conf comment fixes
2023-05-30 20:30:26 +02:00
Adrian Siekierka
555ae0e695
Revert "Migrate Internet Card to Apache HTTPClient, fix #3364 "
...
This reverts commit 9f1d521e4a6f4d75ce7460a7ef4ccd6bd29fbf45.
2023-05-30 20:28:43 +02:00
Adrian Siekierka
4cbe57d250
start work on 1.8.1
2023-05-11 15:28:39 +02:00
Adrian Siekierka
9833087196
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2023-05-07 11:01:45 +02:00
Adrian Siekierka
8fb006a666
fix #3596
2023-05-07 11:01:29 +02:00
Adrian Siekierka
db40014c07
freeze ForgeGradle 5.1 version for now
2023-05-07 10:24:12 +02:00
Adrian Siekierka
5c067d3872
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2023-05-07 10:22:44 +02:00
Adrian Siekierka
dc6a57940f
Merge pull request #3597 from deVDem/master-MC1.7.10
...
Update ru_RU.lang
2023-05-07 10:12:00 +02:00
Adrian Siekierka
cf07d3e06a
Merge pull request #3585 from 5kuper/patch-3
...
Add Roboheart from OMORI to robot names
2023-05-07 10:11:56 +02:00
Adrian Siekierka
3e3e64460d
add Nano to robot names
2023-05-07 10:07:19 +02:00
Adrian Siekierka
c7c9601475
fix #3603
2023-05-07 10:04:41 +02:00
Adrian Siekierka
d3d887f22f
fix #3609
2023-05-07 09:57:02 +02:00
Adrian Siekierka
f8cb77e441
fix #3591 , possibly
2023-05-07 09:54:37 +02:00
Adrian Siekierka
25773cc5eb
fix #3588
2023-05-07 09:54:37 +02:00
Roman Medvedev
358fb80a30
Update ru_RU.lang
...
Added some missed translations
2023-01-12 16:10:45 +03:00
Dmitry Polyukhovich
c2f73a0267
Add Roboheart from OMORI to robot names
2022-11-27 00:26:53 +03:00
Adrian Siekierka
1c0dc67182
Merge pull request #3584 from 5kuper/patch-1
...
Add WX-78 from Don't Starve to robot names
2022-11-26 22:21:40 +01:00
Dmitry Polyukhovich
a3c2b5cac1
Add WX-78 from Don't Starve to robot names
2022-11-27 00:14:21 +03:00
Adrian Siekierka
2001ba1cf4
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2022-11-21 18:48:36 +01:00
Adrian Siekierka
c07e441613
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2022-11-21 18:46:30 +01:00
Adrian Siekierka
aa1a472494
update changelog
2022-11-21 18:46:14 +01:00
Adrian Siekierka
a1a96ba700
fix #3579
2022-11-21 18:42:11 +01:00
Adrian Siekierka
fc6c8940f4
Merge pull request #3577 from Philippus/patch-1
...
Fix typo (robot name source comment)
2022-11-17 21:27:04 +01:00
Philippus Baalman
b85122a9f9
Fix typo
2022-11-16 20:18:34 +01:00
Adrian Siekierka
d06c311206
Merge branch 'master-MC1.12' of github.com:MightyPirates/OpenComputers into master-MC1.12
2022-11-11 10:41:26 +01:00
Adrian Siekierka
578a5591ec
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2022-11-11 10:37:10 +01:00
Adrian Siekierka
7de3aed91f
Merge remote-tracking branch 'repo-alt/feature/TransposerFluids' into master-MC1.7.10
2022-11-11 10:23:00 +01:00
Adrian Siekierka
1cdaf22a7f
buildscript (1.7): update ForgeGradle
2022-11-11 10:17:32 +01:00
Adrian Siekierka
dc55abe1c4
Improve .hex font loading code.
...
- Optimize string logic to reduce unnecessary object churn (~2x faster font load times).
- Add support for multiple font.hex IResources - this allows resource packs to only partially
override the OpenComputers font without removing existing glyphs, opening the door for
non-compatibility-breaking glyph addition packs or partial alternate fonts.
2022-11-11 10:13:02 +01:00
Adrian Siekierka
13d288eadc
Merge pull request #3571 from AmandaCameron/fix/1.12-build
...
Fix/1.12 build
2022-10-22 18:13:00 +02:00
Amanda Cameron
83e69f0fe4
Fix 1.12 build.
...
In betwen OC for 1.7 and OC for 1.12 it seems that the class
li.cil.oc.api.prefab.ManagedEnvironment was renamed to
li.cil.oc.api.prefab.AbstractManagedEnvironment -- This fixes the
DataCard class to use the new prefab class name.
2022-10-22 11:25:40 -04:00
Adrian Siekierka
7dec837408
Merge remote-tracking branch 'origin' into master-MC1.12
2022-10-09 11:45:55 +02:00
Adrian Siekierka
707ffc57a5
chore: unify newlines
2022-10-09 11:40:07 +02:00
Adrian Siekierka
9612829cd9
fix #3568
2022-10-09 11:39:49 +02:00
Adrian Siekierka
f3321f5d5c
Add FreeBSD/amd64 natives.
2022-10-02 18:59:18 +02:00
Adrian Siekierka
9f1d521e4a
Migrate Internet Card to Apache HTTPClient, fix #3364
...
Co-authored-by: hohserg <hohserg1@yandex.ru>
2022-10-02 09:32:13 +02:00
Adrian Siekierka
b75f22a33e
Merge pull request #3565 from TheCodex6824/creative-tablet
...
Fix tablet assigning itself an ID on the client when it should not have one
2022-09-28 22:02:20 +02:00
TheCodex6824
9b8786aaef
Refactored tablet cache id getters
2022-09-28 15:45:32 -04:00
Adrian Siekierka
4a09b855d8
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2022-09-28 16:06:18 +02:00
Adrian Siekierka
2b40e8a5d0
Remove is64Bit check, replace with more robust pointer width check
2022-09-28 16:05:51 +02:00
Adrian Siekierka
e7df708b32
Merge pull request #3564 from TheCodex6824/native-lib-loading
...
Make native library config options more flexible
2022-09-28 15:20:01 +02:00
TheCodex6824
e7f5f824af
Fix tablet assigning itself an ID on the client when it should not have one
2022-09-27 15:27:39 -04:00
TheCodex6824
b40b330e6f
Make native library config options more flexible
...
This replaces the forceNativeLibWithName config option with two new ones: forceNativeLibPlatform and forceNativeLibPathFirst. forceNativeLibPlatform allows overriding the normally auto-detected platform string to a custom value, in case the user is on an unsupported platform. forceNativeLibPathFirst allows choosing a directory to check for natives in, instead of always searching in the jar for one. This allows custom natives to be used without packing them into the mod jar first, which should be much easier for end users.
2022-09-24 20:27:44 -04:00
Adrian Siekierka
efb20a2593
fix compile on 1.12
2022-09-17 23:37:48 +02:00
