Commit graph

1056 commits

Author SHA1 Message Date
Blood-Asp
bcbeebf3b8 First Assemblyline recipes 2016-07-01 02:06:51 +02:00
Blood-Asp
b465f8f25c Adding LuV, ZPM and UV components 2016-07-01 01:41:28 +02:00
Blood-Asp
1497dc47e5 Merge pull request #550 from Muramasa-/Default
Turbine tooltip fixes
2016-07-01 01:16:10 +02:00
Blood-Asp
f496def067 Fixed Pyrooven overclocking 2016-07-01 01:14:35 +02:00
Blood-Asp
73749472d2 Finish Assemblyline recipe printing 2016-07-01 01:13:09 +02:00
Blood-Asp
7ee09889d9 Finish Assemblyline recipe check 2016-06-30 22:17:18 +02:00
Muramasa
d8df9e1565 Turbine tooltip fixes 2016-06-30 18:14:34 +01:00
Blood-Asp
173e5a11d7 Merge pull request #547 from perkinslr/experimental
Make plasma turbine output cooled versions of plasma
2016-06-30 14:49:25 +02:00
Logan Perkins
ad8ad42542 Update GT_MetaTileEntity_LargeTurbine_Plasma.java 2016-06-29 22:37:41 -07:00
Blood-Asp
90d776893e More Assembly Line recipe work 2016-06-30 00:12:00 +02:00
Blood-Asp
22525fd6e8 Merge pull request #546 from perkinslr/experimental
Fix 'cannot find symbol' error in AdvMiner2
2016-06-29 00:23:44 +02:00
Logan Perkins
fcb685693e Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:28:18 -07:00
Logan Perkins
9be4d8c270 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:20:47 -07:00
Logan Perkins
4adb6554c2 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-27 17:12:02 -07:00
Blood-Asp
b9ee95c797 AL Recipe work 2016-06-27 23:49:18 +02:00
Blood-Asp
315a257643 Merge pull request #542 from perkinslr/experimental
Silk-touch then pulverize ores in advanced miner II
Guess i will try this out.
2016-06-26 21:36:31 +02:00
Logan Perkins
dfb263e7dd Update GT_MetaTileEntity_AdvMiner2.java 2016-06-25 15:43:13 -07:00
Logan Perkins
1fe2787532 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 20:50:10 -07:00
Logan Perkins
577ea17e65 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 20:45:04 -07:00
Logan Perkins
9ed45df5b7 Update GT_MetaTileEntity_AdvMiner2.java 2016-06-24 16:18:03 -07:00
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
Blood-Asp
e21311b919 Fix Superfuel railcraft compat and expand thaumcraft check 2016-06-24 17:49:22 +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
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
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
Techlone
ee2abbd3f2 AdvMinerII: check that ore block still exists; consider chance output 2016-06-22 01:30:27 +05:00
Techlone
f139b7ba16 Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental 2016-06-22 00:32:27 +05:00
Blood-Asp
7a9c3857e2 Merge pull request #526 from perkinslr/experimental
Make processing array handle multiple input stacks at a time
2016-06-21 19:56:34 +02:00
Blood-Asp
5728c8d93f Merge pull request #534 from Muramasa-/DieselGenerator
Bug Fixes
2016-06-21 19:56:20 +02:00
Blood-Asp
75d71e546b Fix fced86e11a hiding almost all metaitems 2016-06-21 19:51:54 +02:00
Muramasa
434450107b This client likes to uncheck files 2016-06-21 18:28:29 +01:00
Muramasa
6e656668cc Wrong pipe oredict 2016-06-21 00:35:10 +01:00
Muramasa
7e52fb2805 Bug fixes for my commits
Removed commented out old turbine texture code
Fixed Diesel Engine "Fuel Value" unit to EU/L
Fixed mistake with Diesel Engine tooltip. Now asks for Gear boxes.
Forgot to add recipe for Engine Intake.
Redone the Gas/HPSteam turbine recipes.
Fixed Oxygen/Lube being consumed if there is diesel in the hatch, but
not enough for the engine to run
Updated Engine GUI
2016-06-21 00:17:21 +01:00
Muramasa
660105ba28 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator 2016-06-21 00:17:12 +01:00
Techlone
8e9daf0f67 Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental 2016-06-20 16:17:16 +05:00
Logan Perkins
f16aeb2d1f Update GT_MetaTileEntity_ProcessingArray.java 2016-06-19 15:58:04 -07:00
Muramasa
8e25705a3d Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator 2016-06-19 23:46:40 +01:00
Blood-Asp
f708fc5ff8 Corrected Wood Plates burn value 2016-06-20 00:40:00 +02:00
Blood-Asp
d61667d436 Improved Ultimet stats 2016-06-20 00:39:42 +02:00
Blood-Asp
6af9d982c8 Notch apple to magic fuel 2016-06-20 00:24:09 +02:00