971 Commits

Author SHA1 Message Date
BallOfEnergy
b168a31350
Merge branch 'master' into master 2023-08-03 18:28:11 -05:00
Bob
09b83da578 armor UV, fixes, electrolyzer recipes 2023-08-03 13:37:23 +02:00
BallOfEnergy
39e37f0676 Fixed a minor bug in the coordinate OC compat for launch pads, also removed a feature because it keeps throwing a NullPointerException and I have no clue how to fix it 2023-08-03 02:36:58 -05:00
BallOfEnergy
5e1f3b3134 Makes the new functions direct calls, which I had forgotten to do beforehand. 2023-08-03 00:51:12 -05:00
BallOfEnergy
eaedb33a77 Revamped OpenComputers compatibility, the following is a list of changes/additions.
Added compatibility to the large launch pad
Changed the way that fluids are handled by OC, they now use the internal names of said fluids.
Changing over to a more compact function for energy related compatibility, not doing it fully until people have a bit of time to modify their programs.
Fixed a minor bug where changing the steam type using OC in a RBMK boiler could potentially make infinite steam.
Wiki will be updated for the compatibility on merge of this PR.
2023-08-01 23:49:50 -05:00
Bob
a869a57ff2 NEI handlers for custom machines, nether bedrock ores, electrolyser crap 2023-07-31 20:45:57 +02:00
Bob
647c837909 and now for something completely different 2023-07-30 19:00:35 +02:00
Bob
1ffb2737aa ow 2023-07-25 22:21:48 +02:00
Toshayo
ccb91d98bf
Added satellite managing commands, fixed some satellite map storage stuff 2023-07-24 14:06:46 +02:00
Toshayo
a22a68744c
Satellite linker will no more give duplicate frequency. Some satellite code improvements, rearrangements 2023-07-24 12:44:32 +02:00
Bob
33bd961e0c toora loora 2023-07-24 12:03:13 +02:00
Bob
4bc09afb1f even more custom machine crap 2023-07-22 18:30:32 +02:00
Bob
0fdfae999e hey shitass, stop fucking with my gitignore 2023-07-19 14:45:32 +02:00
HbmMods
0efb99b78c
Merge pull request #1117 from BallOfEnergy1/ocshit
Added OC compatibility to yet another block (more coming soon)
2023-07-19 11:17:22 +02:00
Bob
4c3047c121 glaggle 3: return to blibble's field 2023-07-19 11:15:42 +02:00
BallOfEnergy
8d22bda8fb fix the OC part where I18nUtil was being called (no longer is it being called) 2023-07-18 20:45:54 -05:00
BallOfEnergy
c1896aa4fb
Merge branch 'HbmMods:master' into master 2023-07-18 20:39:36 -05:00
BallOfEnergy
02e1ae5fbc Revert "RBMK redstone column that doesn't work (will work eventually)"
This reverts commit 424d6c3486d0c5ffb4d7e9f7d951c026ba48f7fb.
2023-07-18 20:34:59 -05:00
BallOfEnergy
3041e68896 there you got your damn comparator support for tanks 2023-07-18 20:27:41 -05:00
Bob
ecec7e5a36 the malicious gigglefish from the silly dimension 2023-07-18 18:34:16 +02:00
BallOfEnergy
949b4ae66a
Merge branch 'HbmMods:master' into master 2023-07-17 14:17:53 -05:00
Bob
05c87528a0 youch 2023-07-17 10:30:41 +02:00
Bob
ea8dcd9508 tweaks and fixes, template crate 2023-07-15 22:30:49 +02:00
Boblet
24a0fbffef ported all bullet effects to the NT system 2023-07-14 15:09:46 +02:00
BallOfEnergy
424d6c3486 RBMK redstone column that doesn't work (will work eventually) 2023-07-13 23:39:04 -05:00
Bob
18a1b103ba some pistol tweaks, compressor fix, cryo cannon texture 2023-07-10 21:38:41 +02:00
Bob
b443c3449d fuck you fuck you fuck you fuck you fuck you fuck you fuck you fuck you 2023-07-09 19:46:38 +02:00
Bob
925236e538 iboiler texture, coilgun, bunch of fixes, recipes 2023-07-09 17:28:11 +02:00
Bob
bc8dfcaa99 coolers 2023-07-06 20:48:25 +02:00
Boblet
e78406f64f redstone over radio item counter 2023-07-06 15:33:05 +02:00
Bob
25a7a6c345 new multiblock sys for assembler 2023-07-05 22:42:36 +02:00
Bob
5f109b61ec i can't feel my limbs 2023-07-05 22:26:20 +02:00
Bob
4ad28d25f4 industrial boiler 2023-07-04 22:12:10 +02:00
Bob
843efd575e some train stuff 2023-07-02 18:59:47 +02:00
Bob
65ed6a4f9a helium 4 plasma 2023-07-01 21:43:29 +02:00
HbmMods
738e698d72
Merge pull request #1096 from HbmMods/pr1083
Pr1083
2023-07-01 20:27:59 +02:00
Bob
8bc1f73075 big smoke 2023-07-01 19:19:09 +02:00
Boblet
fcfa725f0b pipable exhaust 2023-06-30 11:57:28 +02:00
HbmMods
4f67d5b11f
Merge branch 'pr1083' into master 2023-06-30 07:56:09 +02:00
HbmMods
0b36b76f3e
Merge pull request #1084 from Voxelstice/pylon-stuff
Wiring errors with slightly more info
2023-06-30 07:54:05 +02:00
Bob
7c1d5bd3e3 fixes, localization, chimney 2023-06-29 20:59:13 +02:00
Boblet
61132bd310 I REMBER 2023-06-29 16:08:32 +02:00
Bob
cd12d6d9af configs configs, glyphid meat, yummy yummy fruit salad 2023-06-28 22:05:29 +02:00
Voxelstice
f29a9d7250
those extra 2 lines aren't useful anymore 2023-06-26 22:33:11 +03:00
Voxelstice
f9959e9a4a aaaaaaaaaaaaaaaaaa 2023-06-26 22:31:53 +03:00
Bob
0ac2445329 i'll fucking shoot somebody 2023-06-26 19:52:36 +02:00
Toshayo
28c43462f1
Merge remote-tracking branch 'HbmMods/master' 2023-06-26 19:25:49 +02:00
Bob
99cfce0e5d pollution effects for heavy metal and poison 2023-06-24 17:54:46 +02:00
Boblet
bb15f50047 pressure requirement for recipes 2023-06-23 11:17:37 +02:00
Voxelstice
9c4c081e3e hh 2023-06-23 11:52:55 +03:00