2379 Commits

Author SHA1 Message Date
BallOfEnergy
70397b418d
yeah uh redoing OC compat
yeah it should work now idk
2023-04-03 09:01:56 -05:00
BallOfEnergy
8259c17e68
Merge pull request #1 from BallOfEnergy1/BallOfEnergy1-OC-Test-1
ok yeah it works well enough to do the job
2023-04-03 08:56:52 -05:00
Bob
da1b4b24f1 broadened stat reregistering exception ignoring scope, meteorite gen fix 2023-04-02 20:54:48 +02:00
HbmMods
92bed8ae6c
Merge pull request #982 from TehTemmie/master
Small fixes
2023-04-02 20:32:45 +02:00
Bob
c7e3f3bb42 yeah whatever this is 2023-04-02 20:30:22 +02:00
TehTemmie
3bf082a64c
Update ItemRBMKRod.java
Prevents RBMK temperature from skyrocketing to infinity when DisableMeltdowns is enabled by
2023-04-01 22:23:23 +08:00
TehTemmie
a18820e4b5
Parentheses fix #69420 2023-04-01 22:17:36 +08:00
Boblet
b82597c0e3 splitter textures, conveyor grabber 2023-03-31 15:15:11 +02:00
BallOfEnergy
9b449899fb
testing rod names 2023-03-30 09:40:16 -05:00
BallOfEnergy
183fb61cd1
Merge branch 'HbmMods:master' into BallOfEnergy1-OC-Test-1 2023-03-30 09:27:54 -05:00
Bob
5cc6621b94 conveyor splitter 2023-03-29 22:59:24 +02:00
BallOfEnergy
59948c06ed
Merge branch 'HbmMods:master' into BallOfEnergy1-OC-Test-1 2023-03-29 09:13:43 -05:00
Boblet
cd319ef44d experimental particle crap, watz item IO 2023-03-28 16:54:15 +02:00
BallOfEnergy
9d23c8a057
Update TileEntityRBMKRod.java 2023-03-28 09:20:57 -05:00
Bob
1cf051a8b1 ough 1.0.27X4551 2023-03-27 21:47:01 +02:00
Boblet
f0fe4119f5 watz pellet depletion 2023-03-27 16:32:23 +02:00
HbmMods
a85b564211
Merge pull request #971 from Doctor17-git/master
Updated ru_RU.lang
1.0.27X4550
2023-03-26 18:04:18 +02:00
Doctor17-git
19618ee1fa
Updated ru_RU.lang 2023-03-26 17:17:46 +03:00
Bob
7c2e8e27cf she ate 16 tons of coal and died </3 2023-03-26 15:53:22 +02:00
Bob
984338bd7d some tweaks, fans 2023-03-25 22:47:49 +01:00
Bob
668b3be77c funny miner's helmet with headlamp 2023-03-25 00:37:14 +01:00
Bob
d787a9835c little diesel guy 2023-03-24 20:34:17 +01:00
Boblet
295d4c489a watz fluid IO 2023-03-24 15:18:10 +01:00
Bob
0a2edf189d watz tank sharing, missinng mutable texture crash fix 2023-03-23 23:10:32 +01:00
Boblet
4d1e902981 small fixes, watz heat/flux functionality 2023-03-23 16:04:10 +01:00
Bob
1901eb317a watz GUI stuff 2023-03-22 21:02:27 +01:00
Boblet
a6913160e0 killed mud tank, some math stuff 2023-03-22 16:36:06 +01:00
Bob
3453929d86 fixes 2023-03-21 21:48:52 +01:00
Boblet
11125a50e0 big pew pew 2023-03-21 16:18:15 +01:00
Bob
22e96fefd4 inventory proxy for blast furnace extension, cast metal sploosh particle 2023-03-20 21:12:52 +01:00
Boblet
f52dbbec35 ionic gel, blast furnace extension 2023-03-20 15:40:10 +01:00
Boblet
109b6714a8 fixed forge's broken ass item stats 2023-03-20 10:59:12 +01:00
Bob
2c0c57d174 ow 1.0.27X4543H1 2023-03-19 22:03:29 +01:00
HbmMods
8d7046dac3
Merge pull request #962 from Doctor17-git/master
Updated ru_RU.lang
1.0.27X4543
2023-03-19 17:05:24 +01:00
Doctor17-git
9f4a5ea360
Updated ru_RU.lang 2023-03-19 19:04:19 +03:00
Bob
b844adff44 fixes, some recipes 2023-03-19 16:51:09 +01:00
Bob
9145ac6e6d funny flowers 2023-03-18 22:09:14 +01:00
Doctor17-git
7ea0fe4f96
Updated ru_RU.lang 2023-03-18 11:38:27 +03:00
Boblet
b762d23a2a dynamic gas tanks, removed some old assets, recipes 2023-03-17 15:18:29 +01:00
HbmMods
bab2fbc211
Merge pull request #953 from BallOfEnergy1/master
Added OC compatibility
2023-03-17 07:52:09 +01:00
BallOfEnergy1
3e893cfff4 Merge remote-tracking branch 'origin/master' 2023-03-16 16:50:58 -05:00
BallOfEnergy1
54be75f71f Finished up most OC compatibility, tested and ready for merge. 2023-03-16 16:50:49 -05:00
BallOfEnergy
fb1ead6666
Merge branch 'HbmMods:master' into master 2023-03-16 16:40:49 -05:00
Bob
b0c757b09b funny gas recipes 2023-03-16 22:10:04 +01:00
Boblet
0b44f401a1 recipes, duct autoconversion, colloid, funny gas 2023-03-16 16:48:34 +01:00
BallOfEnergy1
8a57f66fa8 Merge remote-tracking branch 'origin/master' 2023-03-15 17:51:35 -05:00
BallOfEnergy1
6a52f65a53 Added the ability to change/read the steam type to and from the RBMK boiler columns. 2023-03-15 17:51:29 -05:00
BallOfEnergy
5792ec8b5e
Merge branch 'HbmMods:master' into master 2023-03-15 17:43:37 -05:00
BallOfEnergy1
132240bc03 Merge remote-tracking branch 'origin/master' 2023-03-15 17:29:23 -05:00
BallOfEnergy1
3b564d5f92 Fixed some crucial issues with the heater OC compatibility, along with some added functionality for detecting core and skin heat of rods in the RBMK fuel columns. 2023-03-15 17:29:16 -05:00