1595 Commits

Author SHA1 Message Date
Pheonix
48e6a08fcd finally beginning the electrolyser 2022-04-08 11:16:57 +01:00
Pheonix
9dc0d40c2b Merge remote-tracking branch 'upstream/master' 2022-04-07 09:52:21 +01:00
Bob
ded8b00310 new fluid net test 2022-04-06 20:33:57 +02:00
Boblet
62f819daca made tomb gas even funnier 2022-04-06 16:51:00 +02:00
HbmMods
cff229c5c4
Merge pull request #554 from Pvndols/master
Thorium fuel production in RBMK irradiation channel
2022-04-06 16:17:17 +02:00
HbmMods
7b65976a12
Merge pull request #547 from Doctor17-git/master
Updated ru_RU.lang
2022-04-06 16:16:56 +02:00
Boblet
4071fc87bb cleaned up some configs, more radiation config options 2022-04-06 13:32:17 +02:00
Boblet
c40ba15023 spicy ME drives 2022-04-06 11:53:28 +02:00
Bob
7d3a4d197b funky NEI handling memes, arsenic 2022-04-05 20:30:29 +02:00
Pvndols
6d5d0b855b Thorium fuel production in RBMK irradiation channel
i hope i didn't fuck shit up
2022-04-05 11:41:29 +02:00
Boblet
a3398eb416 "show all recipes" button for universal NEI handlers 2022-04-04 15:58:06 +02:00
Boblet
ce7e6d07b2 finished cable debugger, disabled bidirectional re-eval 2022-04-04 13:03:24 +02:00
Boblet
7cb0bec184 proxy tiles work with re-eval, network debugger item 2022-04-04 11:19:23 +02:00
Doctor17-git
86903e8a2e
Updated ru_RU.lang 2022-04-03 21:55:55 +03:00
HbmMods
27b9948b2b
Merge pull request #546 from Vaern/master
pull request withdrawal symptoms
1.0.27X4193
2022-04-03 19:57:34 +02:00
Bob
086e17d1a9 bunch of fixes, some configs 2022-04-03 19:56:34 +02:00
Vaern
f4ddd51b0a
Merge branch 'HbmMods:master' into master 2022-04-03 08:42:27 -07:00
Vaern
e69f403f15 radiolysis buff 2022-04-03 08:42:54 -07:00
Bob
80667f5eed minecraft doesn't crash for 10 seconds challenge (100% impossible) 2022-04-01 22:23:53 +02:00
Bob
6280d92a83 oh the log spam 1.0.27X4191 2022-04-01 19:10:44 +02:00
Bob
58c1236ab5 finished classic cable 2022-04-01 19:07:06 +02:00
Boblet
115cc07af8 more world gen configs, classic cable renderer half done 2022-04-01 15:26:13 +02:00
Bob
1478664109 fixed mappings and broken textures 2022-03-31 22:54:10 +02:00
Vaern
db93e52b6c Merge remote-tracking branch 'origin/master' 2022-03-31 12:52:02 -07:00
Vaern
2d2fee0074
Merge branch 'HbmMods:master' into master 2022-03-31 12:44:26 -07:00
Boblet
6af5a8eb35 some small fixes, ore rendering with layers 2022-03-31 16:36:26 +02:00
Bob
c1b9ef3e17 fixed energy voids, sulfuric acid puddles 2022-03-30 23:23:38 +02:00
Boblet
d05854f514 classic cable 2022-03-30 16:10:17 +02:00
Boblet
957b07cca3 more fluid API, tank labels (finally) 2022-03-29 16:39:54 +02:00
Bob
ff87b1a062 proper sulfuric acid 2022-03-28 23:55:03 +02:00
HbmMods
8400098be0
Merge pull request #538 from Doctor17-git/master
Updated ru_RU.lang
2022-03-28 16:37:06 +02:00
Boblet
dcb7ad550c more fluidAPI, sulfuric acid, asbestos caves 2022-03-28 16:33:19 +02:00
Doctor17-git
202a31ff2f
Updated ru_RU.lang
aaaa
2022-03-28 10:01:40 +03:00
Vaern
b1054fe10c Merge remote-tracking branch 'HbmMods/master' 2022-03-27 13:21:52 -07:00
Bob
6e3f40f0d2 test fluid ducts, hazard tweaks 1.0.27X4186 2022-03-27 21:50:29 +02:00
Bob
d517d665df sulfur caves, new test pipe 2022-03-26 23:35:05 +01:00
Bob
c662895f8e implemented re-eval for power nets
this should keep power nets intact when links (i.e. cables) are removed instead of outright destroying them they are re-calculated. this should keep unloaded and cached links intact which would otherwise not reconnect on their own.
2022-03-22 14:48:02 +01:00
Pheonix
fc59b72425 Merge remote-tracking branch 'upstream/master' 2022-03-20 20:24:02 +00:00
Bob
8c005a39fb removed machine sound category 1.0.27X4179 2022-03-20 16:12:18 +01:00
HbmMods
67e180ccb2
Merge pull request #531 from 7pheonix/master
i am screaming hel
2022-03-20 09:52:52 +01:00
Pheonix
2a1575c578 i really hope this doesn't break anything 2022-03-19 22:46:43 +00:00
Pheonix
4086b8633d Merge remote-tracking branch 'upstream/master' 2022-03-19 16:42:32 +00:00
HbmMods
b687aed5db
Merge pull request #530 from Doctor17-git/master
Updated ru_RU.lang
2022-03-19 14:40:54 +01:00
Doctor17-git
891b747e78
Updated ru_RU.lang
впвавпавпвавпвавпвавпавп
2022-03-19 16:34:47 +03:00
Bob
32de31874e fixes for chemplant IO, armor clipping, nuke furnace 1.0.27X4178 2022-03-19 14:07:22 +01:00
Vaern
c47072ab1d Revert "Merge remote-tracking branch 'origin/master'"
This reverts commit e62144b627398e8e2fa39be3d686ee963fa631c1.
2022-03-18 19:22:20 -07:00
Vaern
e62144b627 Merge remote-tracking branch 'origin/master' 2022-03-18 19:22:05 -07:00
Vaern
b8132a2ac6 Merge remote-tracking branch 'HbmMods/master' 2022-03-18 19:21:04 -07:00
Bob
8c36f6e36d power diodes with configurable throughput 2022-03-18 16:44:38 +01:00
HbmMods
bfdd790faf
Merge pull request #524 from TehTemmie/master
Some small fixes
2022-03-17 18:48:30 +01:00