2283 Commits

Author SHA1 Message Date
Boblet
dedd3a22a2 the recipening, killed lead revolver, .357 bullet compatibility 2023-02-24 14:57:00 +01:00
HbmMods
9547e5acec
Merge pull request #920 from Vaern/master
Moved ZIRNOX rods over to ItemEnumMulti
2023-02-23 08:42:48 +01:00
Bob
202620c73a NBT pain 2023-02-21 20:01:26 +01:00
Boblet
cfa87c084c fix, nix, nyx, dyx 2023-02-21 16:45:59 +01:00
Boblet
a7e51e6059 radioactive crates, containment box 2023-02-21 13:14:58 +01:00
HbmMods
dbe2b1fcc9
Merge pull request #917 from Doctor17-git/master
Updated ru_RU.lang
1.0.27X4515
2023-02-19 20:53:17 +01:00
Doctor17-git
fc4352af4c
Updated ru_RU.lang 2023-02-19 22:48:47 +03:00
Bob
1dc976d337 i didn't expect this to be done in time tbh 2023-02-19 20:40:08 +01:00
Doctor17-git
17efb82abf
Updated ru_RU.lang 2023-02-18 13:33:56 +03:00
Bob
2b7a8f7d0f yummy crayons 2023-02-17 23:30:39 +01:00
Boblet
6b23588aa7 and now for something completely different 2023-02-17 14:51:35 +01:00
Bob
7b8c87478a ...and nobody could tell the difference, nothing of value was lost 2023-02-16 21:58:54 +01:00
Boblet
fe48a47c95 two-smack jack's signature weapon 2023-02-16 16:53:19 +01:00
HbmMods
69fc93a432
Merge pull request #914 from Vaern/ace-combat-zero-reference
ace combat zero reference
2023-02-16 09:07:48 +01:00
Vaern
5f07bb7896 ace combat zero reference 2023-02-15 14:40:57 -08:00
Bob
f5ceaddfbb explodable refinery yeah 2023-02-15 22:21:20 +01:00
Vaern
a4b067616a fixes 2023-02-15 11:28:43 -08:00
Vaern
0cfcbf1a97 zox rod changes
untested
2023-02-15 09:24:04 -08:00
Boblet
344dd55dfa turbine temperature tweaks 2023-02-15 16:55:06 +01:00
Boblet
90b7ee2ab7 syngas, oxyhydrogen 2023-02-15 16:10:36 +01:00
Vaern
7a4cad0923 Moved ZIRNOX rods to itemenummulti fully
the lord is my shepherd; i shall not want
2023-02-14 23:00:22 -08:00
Vaern
54a2855efa expectation management
wowwe, the wastes were getting a bit too spaghetti for my liking
2023-02-14 22:39:35 -08:00
Vaern
0af3e1eac6 better name :3 2023-02-14 17:50:51 -08:00
Vaern
8b2a304e62 start of moving zirnox, other rods to enummulti 2023-02-14 15:04:53 -08:00
Bob
9dc3061160 cancelable shotgun reloads, more recipe configs 2023-02-14 22:28:33 +01:00
Bob
84c28767db loud man johnson 2023-02-13 22:41:35 +01:00
Boblet
ab9fc80e74 gas turbine time 2023-02-13 16:20:15 +01:00
HbmMods
2f48734562
Merge pull request #912 from Vaern/master
Moved canned conserves over to ItemEnumMulti
2023-02-13 10:29:40 +01:00
Vaern
c2c60388a3 Moved canned conserves over to ItemEnumMulti 2023-02-12 14:42:37 -08:00
Bob
84d5dcb3a6 fissures 2023-02-12 20:42:33 +01:00
Boblet
9242c79ee3 the w 2023-02-10 13:01:09 +01:00
Bob
c9172c5cf8 mimimimimi 2023-02-09 22:43:05 +01:00
Boblet
3ce962018d fixed diodes voiding energy, fixed side restriction confusion 2023-02-09 13:06:07 +01:00
Bob
0e334262ac chemplant recipe localization, some model crap 2023-02-08 23:10:56 +01:00
Boblet
c1decc5162 recipes for new acids, acid mixing 2023-02-08 15:14:28 +01:00
HbmMods
c92b0e3e60
Merge pull request #907 from Doctor17-git/master
Updated ru_RU.lang
2023-02-08 14:35:12 +01:00
Doctor17-git
97c12d021c
Updated ru_RU.lang
updated russian localization
2023-02-08 15:34:31 +03:00
Bob
2b63226bfc fixed acidizer not differentiating recipes by acid type 2023-02-07 22:10:56 +01:00
Boblet
3192331173 blood floats on blood, nitric acid ore processing chain 2023-02-07 15:37:48 +01:00
Boblet
1ef48ead18 more drill bits, acids, bedrock processing, yeeted unused GUIs 2023-02-06 14:30:52 +01:00
HbmMods
5a1fa78350
Merge pull request #885 from Voxelstice/its-oc-again
Some more changes with OpenComputers integration
2023-02-06 08:31:19 +01:00
Boblet
c63cb8b6db a little bit more ore dict 2023-02-06 08:05:44 +01:00
HbmMods
2b00ab2c72
Merge pull request #857 from Vaern/master
Removed schrab & cmb stamps / blades, moved desh tier to actually desh
2023-02-06 08:02:42 +01:00
HbmMods
dac27bbfb3
Merge branch 'master' into master 2023-02-06 08:02:31 +01:00
Boblet
0ddab908f8 post-merge cleanup 2023-02-06 07:59:34 +01:00
HbmMods
e37f2c819f
Merge pull request #897 from martemen/GradleFix
Issue #895: Gradle fix
2023-02-06 07:53:51 +01:00
HbmMods
0e3b6b343e
Merge branch 'master' into GradleFix 2023-02-06 07:53:06 +01:00
Bob
ac5a661c67 maybe crashing servers instantly shouldn't be a feature 1.0.27X4501 2023-02-05 19:35:13 +01:00
Bob
fdd9952fef and that's all, folks 2023-02-05 19:28:53 +01:00
HbmMods
c64e93c9c9
Merge pull request #905 from HbmMods/m763
*mwah*
2023-02-05 18:57:45 +01:00