Commit graph

828 commits

Author SHA1 Message Date
Logan Perkins
8cd97be086 Merge pull request #1 from Blood-Asp/experimental
Update to latest from official
2016-06-24 16:05:20 -07:00
Blood-Asp
01b15f4251 Make Railcraft item Retrival name independent 2016-06-25 00:24:25 +02:00
Dream-Master
fe93065662 Adding Manyullyn to materials 2016-06-24 23:50:15 +02:00
Dream-Master
5e1720e282 Revert "make steam boilers not automatable" 2016-06-24 20:44:28 +02:00
Dream-Master
efaa163cfe Fix Superfuel railcraft compat and expand thaumcraft check (Blood Asp) 2016-06-24 19:35:57 +02:00
Blood-Asp
e21311b919 Fix Superfuel railcraft compat and expand thaumcraft check 2016-06-24 17:49:22 +02:00
Dream-Master
8a3ed09c46 Blood Asp changes 2016-06-24 01:32:57 +02:00
Blood-Asp
cea067c613 More superfuel fixes 2016-06-24 01:08:26 +02:00
Blood-Asp
25a0b460d4 Fix fluiddeath 2016-06-24 00:57:45 +02:00
Blood-Asp
df6e07b5cd Merge pull request #537 from Muramasa-/DieselGenerator
Fuel efficiency changes for Large Diesel Engine
2016-06-24 00:41:46 +02:00
Blood-Asp
104715c86c missed a bit 2016-06-23 23:44:07 +02:00
Blood-Asp
72ff25f9b7 Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block fuel values 2016-06-23 23:43:22 +02:00
Dream-Master
ce97f9d852 Fix Fluid Wet Concrete
remove Plasma Pie we have Neutronium for it.
2016-06-23 22:33:31 +02:00
Muramasa
5263c85dc5 Fuel efficiency changes for Large Diesel Engine 2016-06-23 20:02:43 +01:00
Muramasa
eada7150c5 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator 2016-06-23 18:57:49 +01:00
Blood-Asp
210fc268b1 Remove old crop processing code 2016-06-23 19:31:02 +02:00
Blood-Asp
1d9eb4093e Readjusted Notch Apple fuel value 2016-06-23 18:45:59 +02:00
Muramasa
806e9dbb59 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator 2016-06-23 03:12:01 +01:00
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Dream-Master
0152aba652 Neutronium Blast Furnace only 2016-06-23 00:10:51 +02:00
Dream-Master
5ba763562b no no no 2016-06-22 23:12:57 +02:00
Dream-Master
e1ebdd82f8 e8936bf8d9
AdvMinerII: check that ore block still exists; consider chance output
2016-06-22 23:11:45 +02:00
Dream-Master
18eb7bc358 Bump version 2016-06-22 23:05:15 +02:00
Dream-Master
cbd8034169 move a lot of Machine recipe to the core mod.
Method code to long
2016-06-22 23:03:10 +02:00
Dream-Master
9f15393154 a874d9dd88 [a874d9d] 2016-06-22 22:51:14 +02:00
Dream-Master
759ff09662 9ea49989b6 [9ea4998] 2016-06-22 22:42:28 +02:00
Dream-Master
024fbb4ed4 make Neutronium cheaper 2016-06-22 22:40:34 +02:00
Dream-Master
747c4619d9 f56e821c1b [f56e821] 2016-06-22 22:20:14 +02:00
Blood-Asp
e8936bf8d9 Merge pull request #536 from Techlone/experimental
AdvMinerII: check that ore block still exists; consider chance output
2016-06-22 22:14:44 +02:00
Dream-Master
f36e838f31 e806860390 [e806860] 2016-06-22 22:10:13 +02:00
Dream-Master
c2e5028036 71790e5214 [71790e5] 2016-06-22 22:03:15 +02:00
Dream-Master
9c2acd772d neutronium 2016-06-22 21:59:49 +02:00
Dream-Master
3c2119aaa5 966c948d36 [966c948] 2016-06-22 21:51:31 +02:00
Dream-Master
65300896c0 754300d8fd [754300d] 2016-06-22 21:50:07 +02:00
Dream-Master
6f4c04fcac 099fa5d112 [099fa5d] 2016-06-22 21:39:29 +02:00
Dream-Master
83ea6c146f 334b01dac0 [334b01d] 2016-06-22 21:28:22 +02:00
Dream-Master
fb48f27edb 0a5ea5afae [0a5ea5a] 2016-06-22 21:26:30 +02:00
Dream-Master
64c0c1ca9d c68814f780 [c68814f] 2016-06-22 21:24:15 +02:00
Dream-Master
d52d256f57 1412d578cb [1412d57] 2016-06-22 21:16:01 +02:00
Dream-Master
481d3c1a29 2b96b3ce9c [2b96b3c] 2016-06-22 21:14:20 +02:00
Dream-Master
7cf4b14004 3af174488a [3af1744] 2016-06-22 21:12:55 +02:00
Dream-Master
1e848d2a4f efa4392b33 [efa4392] 2016-06-22 20:53:15 +02:00
Dream-Master
867104b900 851995fb6e [851995f] 2016-06-22 20:51:49 +02:00
Dream-Master
ad665de09d 3cf92b0a59 [3cf92b0] 2016-06-22 20:47:28 +02:00
Dream-Master
fc8ed2e622 9b6927e8e3 [9b6927e] 2016-06-22 20:46:10 +02:00
Dream-Master
35f51d2f3c e85a2d3e8a [e85a2d3] 2016-06-22 20:37:47 +02:00
Dream-Master
39073d7fbc 2d54d34aef [2d54d34] 2016-06-22 20:36:51 +02:00
Dream-Master
10a1a2ee47 Adv Mine 2 Texture 2016-06-22 20:30:31 +02:00
Dream-Master
119cb78923 Textures for the Large Fluid Cans 2016-06-22 19:57:01 +02:00
Dream-Master
7f0ce6117c New Large Fluid Cells 2016-06-22 19:54:59 +02:00