2764 Commits

Author SHA1 Message Date
Vaern
ff85ddfb16 containrs!!! 2023-08-15 21:23:59 -07:00
Vaern
72f892b7dd Merge remote-tracking branch 'HbmMods/master' 2023-08-15 18:16:18 -07:00
Bob
3c6e7920b5 PWR preparation 2023-08-15 20:42:48 +02:00
Bob
35d9e49f23 block drop fix for fallout effects 2023-08-14 20:11:26 +02:00
Boblet
6b381821b8 FENSU and DFC fixes 2023-08-14 16:40:14 +02:00
Vaern
474278cb1b Merge remote-tracking branch 'HbmMods/master' 2023-08-13 17:21:08 -07:00
Bob
157456a0c8 ashpit 1.0.27X4690 2023-08-13 21:04:12 +02:00
Bob
27648ca7a6 lanterns, heating oven connection fix 2023-08-12 22:46:59 +02:00
Vaern
10ab382cf6 shit 2023-08-11 22:22:11 -07:00
Bob
1a3596f33d finished leadburster, congo lake grenade launcher 2023-08-12 00:04:42 +02:00
Boblet
98ec88678a leadburster tweaks 2023-08-11 14:18:23 +02:00
Boblet
3b94f3dafd 40mm leadburster 2023-08-11 12:02:18 +02:00
HbmMods
e3d77e54e3
Merge pull request #1119 from BallOfEnergy1/master
Updated OpenComputers compatibility + slight change to concrete blast res
2023-08-11 08:05:06 +02:00
Boblet
30e2a13f62 fixing mojank spaghetti episode 58304 2023-08-10 15:18:54 +02:00
BallOfEnergy
4975397659
Merge branch 'HbmMods:master' into master 2023-08-09 16:47:46 -05:00
Bob
afd75b26af assets, fixes 2023-08-09 22:28:14 +02:00
Vaern
dd5dc6ed93 Merge remote-tracking branch 'HbmMods/master' 2023-08-08 21:48:50 -07:00
Vaern
4f7659a5dc funny 2023-08-08 21:48:44 -07:00
BallOfEnergy
02e80da344 whoops forgot to change the component name (also added the getFluid() function to the pipe gauge) 2023-08-08 14:14:32 -05:00
BallOfEnergy
e02e28b5d0 Boiler fix and fluid gauge compatibility re-added. 2023-08-08 13:17:13 -05:00
BallOfEnergy
3387cc7f4e idk why those imports were there (removed them) 2023-08-08 13:16:25 -05:00
BallOfEnergy
3fc67e79e1
Merge branch 'HbmMods:master' into master 2023-08-08 12:38:30 -05:00
Boblet
dcfa7fe811 universal analysis tool, pipe debugging 2023-08-08 15:13:11 +02:00
HbmMods
60c4684158
Merge pull request #1135 from Reallondoner/master
Update pl_PL.lang
2023-08-08 09:07:26 +02:00
Reallondoner
b136cbcd62 Update pl_PL.lang
before starting to translate this i thought to myself, "how hard can this be"? turns out, im handing over an assignment that is 30% done

stopped at line 1542, im too tired man, someone finish this because i certainly wont. ive been doing this since march

"At least 99% of what is left to translate are blocks and items, so it shouldnt be that hard" - statements dreamed up by the utterly Deranged

also please check if the oil names are correct theyre quite confusing :)
2023-08-07 18:24:57 +02:00
Bob
f9a81f9b21 finished electrolysis recipes 1.0.27X4683 2023-08-06 19:27:14 +02:00
BallOfEnergy
c18b5dcef5
Merge branch 'master' into master 2023-08-06 03:52:26 -05:00
BallOfEnergy
fa1fd5a65c Merge branch 'master' of https://github.com/BallOfEnergy1/Hbm-s-Nuclear-Tech-GIT-OC 2023-08-06 03:39:08 -05:00
Vaern
5423359205 Merge remote-tracking branch 'HbmMods/master' 2023-08-05 18:59:18 -07:00
Vaern
034c74a55d boo womp 2023-08-05 18:59:07 -07:00
Bob
93ded2740a NEI handlers, more suffering 2023-08-05 20:09:21 +02:00
Bob
ef44b79f83 suffering builds character 2023-08-05 16:33:23 +02:00
BallOfEnergy
61ab7a3483
Merge branch 'HbmMods:master' into master 2023-08-04 15:59:12 -05:00
Bob
77dc34c5a8 mitty! 2023-08-04 15:01:58 +02:00
Vaern
65d4999989 decoration 2023-08-03 22:13:24 -07:00
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
Vaern
b677214381 argh 2023-08-02 14:44:52 -07: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
BallOfEnergy
dc2387f480
Merge branch 'master' into master 2023-08-01 15:08:01 -05:00
Vaern
b0d2d86fdc hehe 2023-07-31 22:39:11 -07: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
BallOfEnergy
1570f2750a Merge remote-tracking branch 'origin/master' 2023-07-28 16:23:51 -05:00
BallOfEnergy
52f39064fc removed the compat for the fluid gauge due to crashes related to the TE. 2023-07-28 16:23:36 -05:00
BallOfEnergy
b0aba8a77a
Merge branch 'master' into master 2023-07-25 15:37:19 -05:00
Bob
1ffb2737aa ow 1.0.27X4671 2023-07-25 22:21:48 +02:00
HbmMods
244fbacd39
Merge pull request #1125 from sdddddf80/Custom-machine-structure-display
Add structure display for custom machine
2023-07-25 22:06:03 +02:00