1330 Commits

Author SHA1 Message Date
Bob
2ea60af5a4 GUI tweaks 2022-01-17 23:02:06 +01:00
Bob
8ef2e4f030 wake me up (wake me up inside) i can't wake up (wake me up inside) 2022-01-17 19:03:43 +01:00
Boblet
f653aae6d3 once more with feeling 2022-01-17 15:13:17 +01:00
Boblet
e70b9b195a uncrashed servers, unbroke fluid strings 2022-01-17 09:13:25 +01:00
Bob
f5bfbd22dc post merge fixes 1.0.27X4116 2022-01-16 21:39:41 +01:00
HbmMods
f731e0dc2d
Merge pull request #393 from Vaern/master
balancing
2022-01-16 21:24:19 +01:00
Bob
39d57c61a0 the lorax, i mean borax 2022-01-16 21:21:51 +01:00
Vaern
038b0455b3 h 2022-01-15 13:07:52 -08:00
Vaern
df8e6c7eb3 actinium funnies 2022-01-15 11:37:02 -08:00
Vaern
d51aab761d
Merge branch 'HbmMods:master' into master 2022-01-15 10:09:19 -08:00
Vaern
3b0763ee9d Last-minute balancing changes 2022-01-15 10:14:03 -08:00
Bob
c9e683bb32 borax, some small fixes, timed mining charges, PR cleanup 2022-01-15 16:54:21 +01:00
HbmMods
50aae39fca
Merge pull request #387 from Vaern/master
Pu238be plate fuel, lead-200 changed to lead-209
2022-01-15 12:11:01 +01:00
Vaern
88bae364ea
Merge branch 'master' into master 2022-01-14 19:09:26 -08:00
Vaern
c7b7106f97 RTG Decay
you don't play game so they are easy do you
2022-01-14 19:11:10 -08:00
Boblet
bd2063c86f The great fluid engoodening part 4
i think that's enough for today
2022-01-14 15:17:07 +01:00
Vaern
78d97fa2b9 WIP RTG shit 2022-01-13 20:30:29 -08:00
Boblet
ac54cc18b9 The great fluid engoodening, part 3 I think 2022-01-12 16:08:55 +01:00
Vaern
1d2a076543 Last-minute balancing changes
UFFR convinced me
2022-01-11 21:08:39 -08:00
Vaern
ee74a4f65e changed spicy lead, added pu238be plate fuel, rebalancing
i'm slightly tilted, since i had to change pb-200 to pb-209, but on the other hand it allows for it to be spicy af
2022-01-11 21:04:46 -08:00
Bob
4a395504cd just like 800 errors left
i will build a time machine, go back to the year 2017 and shoot my former self in the head
2022-01-11 23:40:34 +01:00
Boblet
ab1c6b2d81 this one will hurt a lot
obvious errors in this one, don't try to build it lmao
2022-01-11 17:00:37 +01:00
HbmMods
d003335c5c
Merge pull request #385 from Vaern/master
Fixes + Lead-200
2022-01-11 09:34:40 +01:00
Vaern
f57aa44a41 Fixes + Lead-200 2022-01-10 19:13:03 -08:00
HbmMods
8c33358c1c
Merge pull request #383 from Doctor17-git/master
Updated ru_RU.lang
1.0.27X4109
2022-01-09 21:23:02 +01:00
Doctor17-git
476f7265fe
Updated ru_RU.lang 2022-01-09 23:21:27 +03:00
Bob
e66397ca8a finished substation, proxy TE shenanigans 2022-01-09 21:19:23 +01:00
HbmMods
8f1afce7b3
Merge pull request #380 from Vaern/master
itemhazard's death
2022-01-09 11:05:34 +01:00
Vaern
efe4974242 cleanup 2022-01-08 16:55:40 -08:00
Vaern
aef1de7ba9 itemhazard's death 2022-01-08 16:43:34 -08:00
Bob
6b873b0c81 minor cleanup 2022-01-08 17:52:11 +01:00
HbmMods
2c081af511
Merge pull request #376 from Vaern/master
Research Reactor
2022-01-08 17:03:11 +01:00
Vaern
5937794baf trolling 2022-01-06 15:58:42 -08:00
Vaern
28666ecabd Merge remote-tracking branch 'origin/master' 2022-01-05 18:29:36 -08:00
Vaern
e1b9c6f6f5 bit of fixes 2022-01-05 18:29:32 -08:00
Vaern
292d167d61 i am clowning 2022-01-05 16:25:00 -08:00
Vaern
ba91aef9b4
Update WeaponRecipes.java 2022-01-05 16:23:45 -08:00
Vaern
9b97a7dc3a
Merge branch 'HbmMods:master' into master 2022-01-05 16:16:42 -08:00
Vaern
bb9d444920 ugh
only doing this to appease bob, but what can you do
2022-01-05 16:21:15 -08:00
Bob
49a07b6b74 yeah whatever 2022-01-06 00:24:55 +01:00
Vaern
66ed3ce371 seems to be done 2022-01-04 17:33:13 -08:00
Vaern
5829d5e4cf aa 2022-01-03 19:37:14 -08:00
Vaern
58502b4b23 ah 2022-01-02 21:17:43 -08:00
Vaern
d3e36fafe4 Merge remote-tracking branch 'origin/master' 2022-01-02 09:42:15 -08:00
Vaern
5547ac4914 aaaaa 2022-01-02 09:42:10 -08:00
Vaern
e5ccf3979d
Merge branch 'HbmMods:master' into master 2022-01-02 09:36:28 -08:00
Bob
05b6d9b95a detonator improvements, large pylon, more dynamite 2022-01-02 18:33:40 +01:00
Vaern
26e1c36dac stuff 2022-01-01 14:15:42 -08:00
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