1730 Commits

Author SHA1 Message Date
Voxelstice
5b463d96d9
that didnt fix the conflict 2022-05-23 13:14:20 +10:00
Voxelstice
ac93e2c4b0
fix conflict 1 2022-05-23 13:12:06 +10:00
Voxelstice
415b81f022
rbmk crane that only moves
the load function needs fixing as it doesnt work in opencopmuters :pain:
2022-05-14 21:11:07 +10:00
Voxelstice
c41244da58
getDepletion and getXenonPoison functions 2022-05-14 19:03:21 +10:00
Voxelstice
7165e208a0
Update TileEntityMachineReactorBreeding.java 2022-05-13 16:34:27 +10:00
Voxelstice
f0ba4776b3
Update TileEntityRBMKRodReaSim.java 2022-05-13 16:25:29 +10:00
Voxelstice
60b1e7fcb3
Update TileEntityRBMKRod.java 2022-05-13 16:25:14 +10:00
Voxelstice
e96cca77f4
Update TileEntityRBMKControl.java 2022-05-13 16:23:57 +10:00
Voxelstice
5be83ccee9
Update TileEntityMachineReactorBreeding.java 2022-05-13 16:22:51 +10:00
Voxelstice
24ef4617b9
Update TileEntityReactorResearch.java 2022-05-13 16:22:16 +10:00
Voxelstice
46adbf3273
Update TileEntityReactorZirnox.java 2022-05-13 16:20:40 +10:00
Voxelstice
cf93a0be4a
Update TileEntityCoreStabilizer.java 2022-05-13 16:16:56 +10:00
Voxelstice
9e5e601920
Update TileEntityCoreReceiver.java 2022-05-13 16:16:37 +10:00
Voxelstice
9c150f335b
Update TileEntityCoreInjector.java 2022-05-13 16:16:23 +10:00
Voxelstice
65276ac0b2
Update TileEntityCoreEmitter.java 2022-05-13 16:16:01 +10:00
Voxelstice
dec5e80e0f
Update TileEntityMachineFENSU.java 2022-05-13 16:13:52 +10:00
Voxelstice
2f650fca8d
Update TileEntityMachineBattery.java 2022-05-13 16:12:11 +10:00
Voxelstice
0f15465edb
Update build.gradle 2022-05-13 16:09:39 +10:00
Boblet
2b914628b5 watz connector + template fix 2022-05-12 17:00:04 +02:00
Bob
89a41d4859 finished assemfac animation and texture, magnus cartus 2022-05-11 22:47:33 +02:00
Boblet
eaa727536a windows 7 be gone 2022-05-11 16:25:12 +02:00
Boblet
f08cdb1359 minecart tests, assemfac stabby bois 2022-05-11 15:43:16 +02:00
Bob
bf578c6e99 fixed templates, minecart tomfoolery, assemfac model 2022-05-10 23:10:28 +02:00
Boblet
4628858d64 no more template shifting 2022-05-10 16:24:04 +02:00
Bob
416e2e6278 fixes 1.0.27X4228H1 2022-05-08 21:42:23 +02:00
HbmMods
c0c083d62e
Merge pull request #599 from Doctor17-git/master
Updated ru_RU.lang
2022-05-08 12:09:41 +02:00
Doctor17-git
91c44b9c83
Updated ru_RU.lang 2022-05-08 13:04:21 +03:00
Bob
65812871a0 patching up a release 1.0.27X4228 2022-05-08 11:39:21 +02:00
Bob
033fe07a90 more pointless garbage 2022-05-07 19:08:12 +02:00
Boblet
860d0c61a3 the ferocious muncher 2022-05-06 13:42:02 +02:00
Bob
f3837beb70 bugfixes 2022-05-05 23:06:44 +02:00
Boblet
3dfdacd45a more garbage nobody asked for 2022-05-05 16:06:34 +02:00
Bob
72051a71fc steel crate minecart for some reason 2022-05-04 23:01:02 +02:00
Boblet
9f7c95f79b tiny bit of more fluid IO stuff 2022-05-04 16:51:38 +02:00
Bob
3f02f23096 finished multi fluid ID 2022-05-03 23:05:46 +02:00
Boblet
bd66140b54 GUI fluid identifier 2022-05-03 15:45:00 +02:00
HbmMods
d3e713f977
Merge pull request #597 from Vaern/master
Magnifique
2022-05-03 08:23:09 +02:00
Vaern
31dddc8da1 Revert "yeah"
This reverts commit a1e9edd459a78455ecaca89d5e20b8c0826ddf2e.
2022-05-02 18:10:33 -07:00
Vaern
a1e9edd459 yeah 2022-05-02 18:07:56 -07:00
Vaern
7800b1d1e2 Merge remote-tracking branch 'HbmMods/master' 2022-05-02 17:51:41 -07:00
Vaern
9bf5082236 magnifique
delicious
2022-05-02 17:51:36 -07:00
HbmMods
80ad7be8c7
Merge pull request #596 from Vaern/master
it's just you and me
2022-05-02 10:59:11 +02:00
Vaern
e63afbee10 Merge remote-tracking branch 'origin/master' 2022-05-01 20:10:48 -07:00
Vaern
c3aee19b3a pile shenanigans pt. 2 2022-05-01 20:10:29 -07:00
Vaern
5c2c4d300e pile shenanigans 2022-05-01 20:10:29 -07:00
Vaern
71115ec066 pile shenanigans pt. 2 2022-05-01 20:10:18 -07:00
Bob
e12be50ce6 small fixes 2022-05-01 21:18:12 +02:00
Vaern
cc4b0d01c0 pile shenanigans 2022-04-30 23:07:14 -07:00
Bob
739a6b4b47 oh boy it's 2 in the morning 2022-05-01 01:38:26 +02:00
HbmMods
ef921967c0
Merge pull request #592 from Vaern/master
Schrab fuel & waste + HEN recycling, gas centrifuge gating rebalancing
2022-04-30 16:53:48 +02:00