Commit graph

266 commits

Author SHA1 Message Date
Dream-Master
fafe1bcc88 reverse commit 2016-06-21 19:32:31 +02:00
Dream-Master
4f19001423 Merge branch 'experimental' 2016-06-21 19:21:14 +02:00
Dream-Master
2651e69c70 test 2016-06-21 18:56:37 +02:00
Dream-Master
09add3e8ac even with Blood asp experimental branch 2016-06-21 18:50:29 +02:00
Dream-Master
b09b54435f remove all 2016-06-21 18:42:02 +02:00
Dream-Master
6fe4d4a8d3 bump version 2016-06-07 16:47:51 +02:00
Dream-Master
a874d9dd88 so now Oxygen variant works well
Thanks @Tec
2016-06-07 16:43:14 +02:00
Dream-Master
7026395900 Revert "remove no oxygen component recipe in the ebf because not working."
This reverts commit c29302347c.
2016-06-07 16:09:13 +02:00
Dream-Master
10a02562f2 Revert "so no with the no gas variant."
This reverts commit 150532cd79.
2016-06-07 16:09:06 +02:00
Dream-Master
150532cd79 so no with the no gas variant. 2016-06-06 23:10:28 +02:00
Dream-Master
15b0446f7e bump version 2016-06-06 22:50:24 +02:00
Dream-Master
c29302347c remove no oxygen component recipe in the ebf because not working. 2016-06-06 00:14:12 +02:00
Dream-Master
0458d25021 bump version 2016-05-30 21:19:52 +02:00
Technus
9ea49989b6 Minor Fix
Actually makes the smelt at once cap bigger.
2016-05-30 21:12:25 +02:00
Dream-Master
f56e821c1b Make Stainless Steel more expensive to not skip to quick MV Age 2016-05-28 00:17:38 +02:00
Dream-Master
5c46e9fb88 wrongly remove Code 2016-05-26 00:10:56 +02:00
Dream-Master
ef617a041e fix 2016-05-25 23:40:43 +02:00
Dream-Master
9af2049318 Adding Assembly Line (no Assembler Casing recipe yet) 2016-05-25 23:34:55 +02:00
Dream-Master
76fcaebb23 New Gui Textures Thanks to @Muramas 2016-05-25 22:17:16 +02:00
Dream-Master
78c691d754 Adding the New Turbines from Gt 5.09 and some Assembler recipe 2016-05-25 21:43:52 +02:00
Dream-Master
e806860390 Ethanol fix 2016-05-22 20:09:31 +02:00
Dream-Master
d1cd5baed2 Bump Version 2016-05-22 02:16:24 +02:00
Dream-Master
9f8de14a9f Change Fuel and Nitro diesel values
change Burn value of Lignite coal 4x
Change Gui Pic from Distillation Tower and Large Heat Exchanger (thanks to Draknyte1)
2016-05-22 02:15:51 +02:00
Dream-Master
48dac29710 Thaumcraft Aspect fix 2016-05-22 01:47:08 +02:00
Dream-Master
71790e5214 fix 2016-05-22 01:28:37 +02:00
Dream-Master
cbd6ba6651 Merge branch 'Scan-termals-of-EBF'
Conflicts:
	build.properties
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2016-05-22 01:26:18 +02:00
Dream-Master
2d582f300e Fix #591
Added EBf recipes for Ender io Materials with oxy and without
2016-05-22 01:24:02 +02:00
Dream-Master
7e4aecb65f Change Neutronium Material and add Droconium EFB recipes. 2016-04-30 20:04:07 +02:00
Martin
754300d8fd Merge pull request #10 from GTNewHorizons/Motors
Motors
2016-04-19 19:58:47 +02:00
Technus
966c948d36 Added files via upload 2016-04-19 19:55:28 +02:00
Technus
9b55e2700b Delete TecCape.png 2016-04-19 19:54:51 +02:00
Technus
6d95adb9fd Update GT_MetaGenerated_Item_01.java 2016-04-19 18:43:16 +02:00
Technus
59503f56af Update GT_MetaGenerated_Item_01.java 2016-04-19 18:12:35 +02:00
Technus
94b7324b5a Changed Motor recipes. 2016-04-19 17:59:59 +02:00
Technus
cb2b3cc679 Added files via upload 2016-04-18 19:00:33 +02:00
Technus
6e38c94b6e Update build.properties 2016-04-18 17:05:03 +02:00
Technus
099fa5d112 Merge pull request #9 from GTNewHorizons/Capes-addon
Capes addon
2016-04-18 17:03:59 +02:00
Technus
324b1b56e7 Adding GT:NH Capes 2016-04-18 16:25:35 +02:00
Technus
e993c2799a Merge branch 'Capes-addon' 2016-04-18 13:32:10 +02:00
Technus
bf62bffefb Adding GT:NH Capes 2016-04-18 13:28:36 +02:00
Technus
011d2a771a Adding GT:NH Capes 2016-04-18 12:48:28 +02:00
Dream-Master
334b01dac0 fix #466
Machines higher than IV have a recipe conflict
2016-04-18 00:48:48 +02:00
Dream-Master
0a5ea5afae fix #565
Change Motors to have max 4 cable instead of 16
2016-04-17 22:37:37 +02:00
Dream-Master
843b5e301b Bump version 2016-04-17 17:32:16 +02:00
Technus
97cadb1a53 Merge pull request #8 from GTNewHorizons/Scanner-Update
Adding Multismelter paraller count info to scanner,
2016-04-17 13:11:16 +02:00
Technus
c68814f780 Adding Multismelter paraller count info to scanner,
Adding EBF Heat Capacity to scanner,
 reformatting rest of scanner msgs to be unified
2016-04-17 13:08:19 +02:00
Technus
4c76b14530 Merge pull request #7 from GTNewHorizons/MultiSmelter-Rebalance
Less power consumption for SUPERCONDUCTORs
2016-04-16 23:20:38 +02:00
Technus
1412d578cb Less power consumption for SUPERCONDUCTORs
Will use max 2input hatches
2016-04-16 22:30:33 +02:00
Dream-Master
2b96b3ce9c Draconium needs now new Coils 2016-04-16 22:07:33 +02:00
Technus
767112b88c Update GT_MetaTileEntity_ElectricBlastFurnace.java 2016-04-16 21:58:46 +02:00