5572 Commits

Author SHA1 Message Date
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
Alexander Anishin
7b06e85873 Fixed unhandled side for redstone connection 2023-12-18 12:19:37 +03:00
Martin Robertz
44f59fb36e
update deps
fix wci
2023-10-28 18:45:03 +02:00
Martin Robertz
02682076ce
update bs+deps 2023-10-28 17:32:18 +02:00
Martin Robertz
d8cc5f586d
Merge pull request #109 from koiNoCirculation/fix_sof_crash
Fix sof crash
2023-10-28 14:32:39 +02:00
koiNoCirculation
7db1a65132 Merge remote-tracking branch 'origin/master' into fix_sof_crash 2023-10-17 15:31:33 -07:00
koiNoCirculation
9099cd891c Fix an error happened when connecting two nodes within the same network that causes a stack overflow crash. 2023-10-17 15:29:27 -07:00
Martin Robertz
ce7576e144
remove ic2 maven 2023-09-22 19:00:56 +02:00
Martin Robertz
3b7d4f0634
update bs+deps 2023-09-22 18:31:15 +02:00
Martin Robertz
8eaa30bd58
Merge pull request #108 from koiNoCirculation/oc_driver_reactor_enhance
added setActive for IC2-OC driver, so that the reactor switch can be …
2023-09-18 07:09:14 +02:00
koiNoCirculation
9eb2658a39 added setActive for IC2-OC driver, so that the reactor switch can be directly controlled by adapter, instead of using the redstone I/O. 2023-09-16 22:49:48 -07:00
Martin Robertz
96be9d0559
Merge pull request #107 from mjevans/remove-glNormal
Disable incorrect glNormal calls which caused errors.
2023-09-05 16:57:22 +02:00
Michael J. Evans
dc639b6bfe Disable incorrect glNormal calls which caused errors. 2023-08-22 01:26:57 -07:00
Martin Robertz
91c32e503f
Merge pull request #106 from GTNewHorizons/fixFluidPatterns
Fix modifying fluid patterns with OC
2023-08-11 12:15:14 +02:00
Sampsa
a3eccfb23c Remove PatternHelper 2023-08-10 11:33:45 +03:00
Sampsa
e044edf483 Remove the debug print. Probably a good idea. 2023-08-10 04:20:11 +03:00
Sampsa
b80da3ba19 I wish I knew how to merge 2023-08-09 19:03:06 +03:00
Sampsa
ddce460c19 Merge 2023-08-09 19:00:02 +03:00
Sampsa
a9af55cc32 Fix an oops 2023-08-09 18:58:03 +03:00
Sampsa
d179ceb0a5 Fix modifying fluid patterns with OC 2023-08-09 18:36:24 +03:00
Sampsa
9e027d76a8 Fix modifying fluid patterns with OC 2023-08-09 18:29:56 +03:00
Martin Robertz
2a311a80ef
Merge pull request #105 from GTNewHorizons/fix/packets
use openContainer instead of sending coords
2023-08-03 20:57:28 +02:00
Glease
85e504ae8b
use openContainer instead of sent coords 2023-08-04 02:40:44 +08:00
Martin Robertz
2df36c74e2
fix 2023-07-07 21:31:17 +02:00
Martin Robertz
fc584f34a4
Merge pull request #104 from asiekierka/gtnh-oc-1.8.3
Update to OpenComputers 1.8.3
2023-07-07 21:30:48 +02:00
Adrian Siekierka
74c4ee091d Merge branch 'master-MC1.7.10' into gtnh-oc-1.8.3 2023-07-07 18:16:12 +02:00
Adrian Siekierka
089dd28d05 Bump mod version. 1.7.10-forge/1.8.3 2023-07-07 17:45:31 +02:00
Adrian Siekierka
d13c015357 Rework Internet Card filtering system. 2023-07-07 17:45:01 +02:00
Adrian Siekierka
5a685f87c0 Revert "propose fix for #3628"
This reverts commit f275e0d44ae9bac643c94f78c3a605b9426fcdea.
2023-07-07 17:43:24 +02:00
repo-alt
3b3f4a4548
Merge pull request #103 from GTNewHorizons/feature/fluids
Change fluid amount from int to long in AE2 integration
2023-07-05 08:11:07 +03:00
repo-alt
0ab96aacd9
Merge pull request #102 from GTNewHorizons/feature/docs
Added manual page for ME Upgrade and BeeKeeper Upgrade
2023-07-05 08:10:47 +03:00
Adrian Siekierka
f275e0d44a propose fix for #3628 2023-06-28 15:26:45 +02:00
Adrian Siekierka
1b7761f4ce update changelog 2023-06-28 15:17:00 +02:00
Adrian Siekierka
77649fd246 propose fix for #3635 2023-06-28 15:16:02 +02:00
repo_alt
6156c98f13 Updated GT5 dependency 2023-06-26 11:41:44 +03:00
Adrian Siekierka
9013fc2028 fix #3634 2023-06-24 19:06:34 +02:00
repo_alt
43e6cecee9 Change fluid amount from int to long in AE2 integration
Add Ae2Fc integration to check for blacklisted fluids
2023-06-24 17:39:58 +03:00
repo_alt
0bbee3843e Add manual page for ME Upgrade and BeeKeeper Upgrade
Add dummy environment provider to the ME Upgrade to support API page in NEI
Added ME upgrade to the Adapter blacklist to avoid server kicking in case of misuse
2023-06-16 16:05:54 +03:00
Adrian Siekierka
de8f207f3b
Merge pull request #3627 from JLLeitschuh/feat/JLL/tests_working_again
Get tests running again
2023-06-10 07:43:47 +02:00
Jonathan Leitschuh
8e80453321
Get tests running again
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
2023-06-09 19:31:55 -04:00
Adrian Siekierka
5b2ba76a4c Use HTTPS for deps (again), close #3625 2023-06-10 00:22:26 +02:00
WiseDragoon5374
affac839cb
Fix headers in integration readme (#3623) 2023-06-07 20:46:07 +02:00
Martin Robertz
787a17fdad
Merge pull request #101 from aheirman/master
update gradle build files
2023-06-05 06:49:19 +02:00
aheirman
5ce56aabf2 update gradle build files 2023-06-05 01:24:32 +02:00
Martin Robertz
0d35d6c538
Merge pull request #100 from asiekierka/gtnh-oc-1.8.2
update fork to mainline 1.8.2
2023-06-04 16:29:44 +02:00
Adrian Siekierka
0cf00e6141 Merge branch 'master-MC1.7.10' into gtnh-oc-1.8.2 2023-06-04 15:26:11 +02:00
Adrian Siekierka
94f6405c47 update changelog 1.7.10-forge/1.8.2 2023-06-04 15:07:47 +02:00