360 Commits

Author SHA1 Message Date
Vaern
2f9abdf00f Merge remote-tracking branch 'origin/master' 2022-01-01 10:36:22 -08:00
Vaern
a06fff46ba seven segment displays work! 2022-01-01 10:36:15 -08:00
Vaern
8de85238ac
Merge branch 'HbmMods:master' into master 2022-01-01 10:31:19 -08:00
Bob
734d1fc66d the large boys 2022-01-01 19:30:52 +01:00
Vaern
e0fb379b53 breeding reactor funnies 2021-12-31 23:20:59 -08:00
Vaern
f4650eeb45 more small reactor funnies 2021-12-30 22:37:30 -08:00
Vaern
3efe87becd
Merge branch 'HbmMods:master' into master 2021-12-30 13:34:53 -08:00
Bob
65830d76d1 some pylon memes, spent fuel pool NEI handler 2021-12-30 18:46:05 +01:00
Vaern
e40ea77e3b preliminary small reactor revamp 2021-12-29 22:48:07 -08:00
Bob
2aaa426feb fixed batteries not disconnecting, acidizer output stacks 2021-12-26 22:05:44 +01:00
HbmMods
cbc620f646
Merge pull request #372 from Doctor17-git/master
Updated ru_RU.lang
2021-12-26 21:02:42 +01:00
Doctor17-git
86e821e48c
Updated ru_RU.lang 2021-12-26 23:00:52 +03:00
Vaern
a63686237d
Merge branch 'HbmMods:master' into master 2021-12-26 11:46:10 -08:00
Bob
7967275373 anvil NEI handler, some minor adjustments 2021-12-26 20:45:33 +01:00
Vaern
b8067eee66 radium rtg pellet 2021-12-25 19:32:55 -08:00
Vaern
5f6fed5571
Merge branch 'HbmMods:master' into master 2021-12-22 11:52:59 -08:00
Vaern
218cc2bf02 Merge remote-tracking branch 'origin/master' 2021-12-22 11:57:19 -08:00
Vaern
00aa419e98 a few more achieves 2021-12-22 11:57:14 -08:00
Boblet
ced90d7874 bound new centrifuge model, some fluid preparations 2021-12-22 15:53:18 +01:00
Vaern
97d0a67eef Achievements!
now with an actual progression and even more witty descriptions
2021-12-21 17:28:00 -08:00
Vaern
cdbf5ba588
Merge branch 'HbmMods:master' into master 2021-12-21 17:24:58 -08:00
Bob
6a83d3ffb2 dynamite, dosimeter fix, new gas centrifuge model 2021-12-21 22:52:04 +01:00
Boblet
43a9f2802e dosimeter, some texture upgrades 2021-12-21 15:57:59 +01:00
Vaern
5af357f94f
Merge branch 'HbmMods:master' into master 2021-12-19 17:57:33 -08:00
Vaern
96000abaa2 Gas cent's done! 2021-12-19 18:01:05 -08:00
HbmMods
87b95f4702
Merge pull request #367 from Doctor17-git/master
Updated ru_RU.lang
2021-12-19 20:49:54 +01:00
Doctor17-git
dd763f2d46
Updated ru_RU.lang 2021-12-19 22:46:25 +03:00
Bob
35a7ee8d31 a little bit of everything 2021-12-19 19:07:51 +01:00
Bob
8d07e34583 patched up MG42 2021-12-18 23:14:21 +01:00
Vaern
6cc9ba9cd8 gas cent!
yay
2021-12-17 22:28:03 -08:00
Vaern
65567ac961 Merge remote-tracking branch 'origin/master' 2021-12-17 17:43:36 -08:00
Vaern
0fa36839f6 Revert "self-charging rgp battery!"
This reverts commit 2499b7f8c11d84ce0354494410db15eae87af257.
2021-12-17 17:41:59 -08:00
Vaern
ce67beb3d1
Merge branch 'HbmMods:master' into master 2021-12-16 19:34:22 -08:00
Boblet
3b938c5873 funky xray marker renderer thing 2021-12-16 17:00:08 +01:00
Boblet
d6b741b54f ReC nuclear waste hazard compat, some missing textures 2021-12-15 16:06:58 +01:00
Vaern
2336f43978
Merge branch 'HbmMods:master' into master 2021-12-14 19:42:14 -08:00
Vaern
da704ddd64 Merge remote-tracking branch 'origin/master' 2021-12-14 19:46:21 -08:00
Vaern
2499b7f8c1 self-charging rgp battery! 2021-12-14 19:45:57 -08:00
Boblet
9e97a5caf5 some slight code refactoring, fun with enums 2021-12-14 16:12:03 +01:00
Bob
a6cc151c57 some small fixed, chinese localization 2021-12-12 23:09:05 +01:00
Vaern
4dded8894f Merge remote-tracking branch 'origin/master' 2021-12-11 11:40:21 -08:00
Vaern
86be818cfc Zirnox fixed!
hurrah
2021-12-11 11:40:14 -08:00
Vaern
3322c27bb3
Merge branch 'HbmMods:master' into master 2021-12-11 11:36:23 -08:00
Bob
f57d7f25e2 crucible UB, drillgon bobble, FEnSU fix 2021-12-11 17:13:30 +01:00
Boblet
721bb405eb copper clusters 2021-12-10 14:52:15 +01:00
Bob
832660f8b0 fixed iGen render jank, giant blast furnace UV 2021-12-09 22:51:52 +01:00
Bob
4509cdece3 fixed RTGs not outputting 2021-12-08 23:14:46 +01:00
Bob
779796d4df MG-42 2021-12-06 19:06:58 +01:00
HbmMods
efe0ad736a
Merge pull request #359 from Doctor17-git/master
Updated ru_RU.lang
2021-12-05 20:40:45 +01:00
Doctor17-git
91bfe6b533
Updated ru_RU.lang 2021-12-05 22:36:35 +03:00