1248 Commits

Author SHA1 Message Date
Vaern
97d0a67eef Achievements!
now with an actual progression and even more witty descriptions
2021-12-21 17:28:00 -08: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
Vaern
2336f43978
Merge branch 'HbmMods:master' into master 2021-12-14 19:42:14 -08:00
Boblet
9e97a5caf5 some slight code refactoring, fun with enums 2021-12-14 16:12:03 +01:00
Boblet
bb513f3b9f GC and AR shredding recipes for moon turf 2021-12-13 16:22:13 +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
HbmMods
20eb5648bc
Merge pull request #364 from Vaern/master
Zirnox finally fixed
2021-12-11 20:37:44 +01: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
HbmMods
6df784986b
Merge pull request #363 from TehTemmie/patch-2
Fixed rounding errors with large reactor
2021-12-10 08:46:15 +01:00
Bob
832660f8b0 fixed iGen render jank, giant blast furnace UV 2021-12-09 22:51:52 +01:00
Boblet
2507880cb9 put the mg42 model in the right spot 2021-12-09 16:47:36 +01:00
Bob
4509cdece3 fixed RTGs not outputting 2021-12-08 23:14:46 +01:00
TehTemmie
2a6480c35d
Fixed rounding errors with large reactor
Large reactor rods only affected heat produced (which in turn affects steam production) in increments of 10% (for example, 19% control rod level produced the same heat as 10%) while still consuming more fuel. This change (hopefully) fixes that error, assuming it wasn't intentional. (Yes, I suck at pull requests)
2021-12-07 20:16:25 +08: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
1.0.27X4074
2021-12-05 20:40:45 +01:00
Doctor17-git
91bfe6b533
Updated ru_RU.lang 2021-12-05 22:36:35 +03:00
Bob
a77cf08818 igen 3: revenge of the sith 2021-12-05 20:33:56 +01:00
HbmMods
b54a36f716
Merge pull request #355 from Vaern/master
Some Radium + Ducrete Love & Rebalancing
2021-12-05 11:15:27 +01:00
Bob
43ba0f135d buffed RTGs, fixed loot block dropping, pylon cable length fix 2021-12-05 11:13:27 +01:00
Vaern
9695763605 ducrete love 2021-12-04 19:00:08 -08:00
Vaern
8c076968b4 Merge remote-tracking branch 'origin/master' 2021-12-03 19:42:46 -08:00
Vaern
9a5a597870 radium love and rebalancing 2021-12-03 19:42:40 -08:00