1714 Commits

Author SHA1 Message Date
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
Vaern
0316408cee there you go 2022-04-29 16:17:36 -07:00
Vaern
2c14cd6a74 oh yeah, for less CBT
this way the dosimeter should still be more useful whilst not being as bad
2022-04-28 19:39:12 -07:00
Vaern
d7ded5f2cb Schrab Fuel & Waste recycling, HEN recycling, GC gating rebalancing 2022-04-28 19:19:49 -07:00
Vaern
60fd084e80 Merge remote-tracking branch 'HbmMods/master' 2022-04-28 17:26:48 -07:00
Boblet
a77291528c configurable chemplant recipes 2022-04-28 13:21:51 +02:00
Vaern
aa29deec7d Revert "."
This reverts commit fe5d0ee3001ea34ab1f1f95e826abeb305513299.
2022-04-27 19:16:50 -07:00
Vaern
fe5d0ee300 . 2022-04-27 18:37:36 -07:00
Vaern
e1296cdd36 Merge remote-tracking branch 'HbmMods/master' 2022-04-27 17:30:20 -07:00
Bob
9328cbbd20 first working test for universal JSON recipes 2022-04-27 23:20:37 +02:00
Vaern
2a97d10cf6 tiny little baby pr 2022-04-27 08:43:59 -07:00
Vaern
890a47e64e Merge remote-tracking branch 'HbmMods/master' 2022-04-27 08:16:46 -07:00
Boblet
b01e260db9 universal system for JSON based recipe configuration 2022-04-27 16:50:34 +02:00
HbmMods
3b70d57dde
Merge pull request #577 from Ambersol13/master
Update SILEXRecipes.java
2022-04-27 08:47:59 +02:00
Vaern
b171943eb7 Merge remote-tracking branch 'HbmMods/master' 2022-04-26 18:29:22 -07:00
Bob
2e3e47fce7 mug recipe 1.0.27X4215 2022-04-25 21:27:47 +02:00
Boblet
bdfda34985 some heatex fixes 2022-04-25 16:51:14 +02:00