1272 Commits

Author SHA1 Message Date
Vaern
e40ea77e3b preliminary small reactor revamp 2021-12-29 22:48:07 -08:00
Vaern
e67d9546f0
Merge branch 'HbmMods:master' into master 2021-12-29 22:42:14 -08:00
Vaern
9be7a1f378 attempts to merge 2021-12-29 22:46:40 -08:00
Bob
8037893637 that should hopefully resolve some garbage 2021-12-29 22:57:45 +01:00
Vaern
e0433a3174 Merge remote-tracking branch 'origin/master' 2021-12-28 17:40:27 -08:00
Vaern
a223f5662c fixes 2021-12-28 17:40:22 -08:00
Bob
2aaa426feb fixed batteries not disconnecting, acidizer output stacks 1.0.27X4095 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
HbmMods
d4c04926f5
Merge pull request #371 from Vaern/master
New Achievements!
2021-12-26 20:50:21 +01: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
06166483b7 pile shenanigans 2021-12-25 21:39:38 -08:00
Vaern
b8067eee66 radium rtg pellet 2021-12-25 19:32:55 -08:00
Vaern
b141ccbb40 minor fixes 2021-12-24 14:07:32 -08:00
Vaern
fa0d6adc66 Centrifuge bobcode removed + debris shredding 2021-12-22 12:47:17 -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
HbmMods
e2af06b02b
Merge pull request #369 from Vaern/master
Fix for nullpointerexception for gas centrifuge
2021-12-21 08:10:12 +01:00
Vaern
67c5555876 Merge remote-tracking branch 'origin/master' 2021-12-20 19:15:47 -08:00
Vaern
e15bc80a07 fixed nullpointer exception 2021-12-20 19:15:37 -08:00
HbmMods
a415dfecac
Merge pull request #368 from Vaern/master
Gas Centrifuge Rework
2021-12-20 21:01:47 +01:00
Vaern
58d2a64165 fixed hardcoding 2021-12-20 08:31:54 -08:00
Boblet
5ff7bf2dec fixed RTG pellets using old values 2021-12-20 16:39:43 +01:00
Vaern
04b23c3ef9 Thank god I caught that early 2021-12-19 18:15:24 -08:00
Vaern
41f582a1db Merge remote-tracking branch 'origin/master' 2021-12-19 18:03:59 -08:00
Vaern
10331011a7 whoops
whoops
2021-12-19 18:03:50 -08:00
Vaern
96000abaa2 Gas cent's done! 2021-12-19 18:01:05 -08:00
Vaern
5af357f94f
Merge branch 'HbmMods:master' into master 2021-12-19 17:57:33 -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 1.0.27X4088 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
742dd54aa4 gas cent actually works!
yay
2021-12-17 17:41:48 -08:00
Vaern
996ba4545e Merge remote-tracking branch 'origin/master' 2021-12-16 19:38:25 -08:00
Vaern
df4bc5c32e gas centrifuge shenanigans
very, very WIP
2021-12-16 19:38:17 -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
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