1526 Commits

Author SHA1 Message Date
Pheonix
3e91094c8f Merge remote-tracking branch 'upstream/master' 2022-03-14 20:34:47 +00:00
Pheonix
adaf445d6c cleanup duty once again 2022-03-14 20:34:08 +00:00
Boblet
9368b68280 some fixes, a bit of the new fluid transfer code, updated forge to 1614 2022-03-14 16:34:52 +01:00
Pheonix
2f7bb54c3a aeugh 2022-03-13 22:15:56 +00:00
Bob
6782663205 fixed SPAS using wrong config for alt fire 2022-03-13 20:09:06 +01:00
Bob
05fb9f5919 my bals 2022-03-13 19:06:36 +01:00
HbmMods
60049322d3
Merge pull request #509 from Doctor17-git/master
Updated ru_RU.lang
2022-03-13 18:51:32 +01:00
Doctor17-git
3ae857a69c
Updated ru_RU.lang 2022-03-13 20:50:33 +03:00
Bob
ab3a11055a æ 1.0.27X4172 2022-03-13 18:32:13 +01:00
Bob
52418ce769 finished steam suit, new gun models, detonator visuals, c4&semtex blocks 2022-03-13 18:15:51 +01:00
Pheonix
6d6712aa98 Merge remote-tracking branch 'upstream/master' 2022-03-12 20:26:51 +00:00
Pheonix
596ac5c300 Time, Doctor Freeman. Is it really that time, again? 2022-03-12 20:26:40 +00:00
HbmMods
bcb8d87326
Merge pull request #494 from MartinTheDragon/fast-fallout
Backport the faster fallout algorithm
2022-03-12 20:00:44 +01:00
Bob
caa9394a92 chemfac fluid IO finished, water cooling 2022-03-12 20:00:11 +01:00
HbmMods
0fe03d1e8f
Merge pull request #501 from 7pheonix/master
GORDON. WE. WILL. KICK. YOUR. ASS!!!
2022-03-12 10:06:27 +01:00
Pheonix
61a708efda AAAAAAAAAAAAAA 2022-03-11 19:34:26 +00:00
Pheonix
d2527be086 what the hell was that there for 2022-03-11 18:40:50 +00:00
Pheonix
0759ac8f68 Merge remote-tracking branch 'upstream/master' 2022-03-11 18:30:14 +00:00
Pheonix
68c075edfc Gordon doesn't need to hear all this 2022-03-11 17:30:21 +00:00
MartinTheDragon
fdfc7a40a4
Delay fallout chunks and adjust ore chances 2022-03-11 17:17:16 +01:00
Boblet
99cdbb9f03 finished semtex and c4 timed bombs, some more laser detonator stuff 2022-03-11 15:16:50 +01:00
Bob
04e63544c7 functional chemfac, chemfac base texture finished, fluid net enhancement 2022-03-10 23:38:41 +01:00
HbmMods
8f8590bf99
Merge pull request #493 from MartinTheDragon/falling-nuke-serialization
Add serialization for EntityFallingNuke
2022-03-10 08:31:13 +01:00
Bob
dbce273e03 some more chemfac work, expanded fluid acceptor interface 2022-03-09 22:17:03 +01:00
MartinTheDragon
4cf9d64d8e
Make the fallout chunk precision self-adjusting 2022-03-09 18:38:47 +01:00
MartinTheDragon
1f28a7c9f5
Backport the faster fallout algorithm 2022-03-09 16:56:53 +01:00
Boblet
9477cf8b68 fortune support for ores, implemented mining plastic explosives (c4&sem) 2022-03-09 16:08:48 +01:00
Bob
717a947b53 better do that now 2022-03-08 22:33:09 +01:00
Bob
58d3178650 C4 now uses a finished ExVNT, chemmfac slot shenanigans 2022-03-08 22:21:28 +01:00
MartinTheDragon
cbb412ebff
Add serialization for EntityFallingNuke 2022-03-08 21:35:19 +01:00
Boblet
70299728da some fixes, finalized ExVNT code 2022-03-08 16:36:57 +01:00
Bob
47be4e97b6 what did i do to deserve this 2022-03-07 19:33:53 +01:00
Boblet
c9872349fe fixed small syntax error, C4 and semtex charge models 2022-03-07 15:39:42 +01:00
Boblet
d3cf2cb43d test for new sound loop system 2022-03-07 13:47:06 +01:00
Bob
9471d66c6e chemfac, look overlays on some machines, some bugfixes, 2022-03-06 18:59:04 +01:00
Boblet
f8cb3ee1ed test sound category, V1 speed, steam suit using steam, armor cleanup 2022-03-04 13:38:35 +01:00
Bob
c3b2838e7a small amounts of trolling 2022-03-02 22:32:53 +01:00
Boblet
833e028aa2 some quackery, missing chemplant features and barrel yeet implementation 2022-03-02 15:53:06 +01:00
Boblet
35201ed420 removed excessive markDirty operations from hadron and RBMK 2022-03-01 13:09:13 +01:00
Boblet
6441aee9d3 handheld barrel yeeting 2022-03-01 11:55:32 +01:00
Bob
d5650da0cb CCC dependency - bottom text 2022-02-28 21:15:28 +01:00
Bob
7a34d437f0 the bear and the bull and the bear and the bull and the bear and the bul 2022-02-28 21:10:40 +01:00
Boblet
d4af867832 fixed chemplant accepting fluids in output, some new sound stuff 2022-02-28 16:58:24 +01:00
Bob
ca72f41ba8 laser detonator model + UV 2022-02-27 22:38:05 +01:00
HbmMods
f43192d7c9
Merge pull request #467 from Doctor17-git/master
Updated ru_RU.lang
2022-02-27 17:03:21 +01:00
Doctor17-git
74e81f29ae
Updated ru_RU.lang 2022-02-27 19:01:24 +03:00
Bob
d3b3cb64b7 more recipe handlers, some fixes, finished RPA, fixed furnace NEI 1.0.27X4158 2022-02-27 16:32:41 +01:00
Boblet
8fab1b25d0 plastic blocks, heat energy values for fluids, more explosive sticks 2022-02-25 13:12:31 +01:00
Bob
7bfd36230d fixed some stuff, finished meta fluid canister, lubricant recipe 2022-02-24 21:21:38 +01:00
Bob
b055bcd703 Auto stash before merge of "master" and "origin/master" 2022-02-24 19:15:44 +01:00