Commit graph

241 commits

Author SHA1 Message Date
Dream-Master
e0fe711de5 b4bfeb21f8 [b4bfeb2] 2016-06-22 19:35:03 +02:00
Dream-Master
8ef1104642 ae58de2708 [ae58de2] 2016-06-22 19:22:13 +02:00
Dream-Master
68fd8c5004 e5803f8c5a [e5803f8] 2016-06-22 19:18:25 +02:00
Dream-Master
9e074b8a4f 04b5d32fe0 [04b5d32] 2016-06-22 18:57:45 +02:00
Dream-Master
ada744c29a d718cac331 [d718cac] 2016-06-22 18:52:27 +02:00
Dream-Master
3eeeee694f d3d2026375 [d3d2026] 2016-06-22 18:27:11 +02:00
Dream-Master
d6f983d922 e3453c05a3 [e3453c0] 2016-06-22 18:14:52 +02:00
Dream-Master
83b346a463 c5746fe652 [c5746fe] 2016-06-22 17:52:59 +02:00
Dream-Master
55c49f3021 remove Nugget to Ingot recipe.
If i know this before i never wrote hundreds of MT Lines
2016-06-22 17:40:58 +02:00
Dream-Master
aa14481d3b abc6cfc291 [abc6cfc] 2016-06-22 17:22:43 +02:00
Dream-Master
2c51d0d12e 1f4f33837d [1f4f338] 2016-06-22 17:12:42 +02:00
Dream-Master
f658c3b362 Error fixes 2016-06-22 01:33:23 +02:00
Dream-Master
42de6e3af4 9c6692c627 [9c6692c] 2016-06-22 01:05:08 +02:00
Dream-Master
9fde6419f2 cd3a4592db [cd3a459] 2016-06-22 01:03:48 +02:00
Dream-Master
cd0f2a498f d9afccdf22 [d9afccd] 2016-06-22 00:55:40 +02:00
Dream-Master
57fa6a070d 2cab6b8166 [2cab6b8] 2016-06-22 00:45:32 +02:00
Dream-Master
2aa9745c48 98566ccee0 [98566cc] 2016-06-22 00:44:36 +02:00
Dream-Master
9e9f985b03 abe8b44886 [abe8b44] 2016-06-22 00:42:14 +02:00
Dream-Master
a5ac676111 bf3a79dc62 [bf3a79d] 2016-06-22 00:41:30 +02:00
Dream-Master
cd29cf4da5 4521769f7b [4521769] 2016-06-22 00:39:40 +02:00
Dream-Master
f186d60ca4 543f71cc97 [543f71c] 2016-06-22 00:37:12 +02:00
Dream-Master
52128fdb46 b0e7ffa8e5 [b0e7ffa] 2016-06-22 00:36:10 +02:00
Dream-Master
cd98901ecf 898a045a97 [898a045] 2016-06-22 00:30:46 +02:00
Dream-Master
5af854d762 87c81f8d85 [87c81f8] 2016-06-22 00:25:57 +02:00
Dream-Master
015bc15aa4 82f14512d8 [82f1451] 2016-06-22 00:17:54 +02:00
Dream-Master
48b2f768e8 f17905aecc [f17905a] 2016-06-22 00:12:59 +02:00
Dream-Master
25e944ca0d a358097858 [a358097] 2016-06-22 00:07:30 +02:00
Dream-Master
3917d26760 91d34c2c68 [91d34c2] 2016-06-22 00:05:04 +02:00
Dream-Master
c00f0f9fc6 ae4ec23ece [ae4ec23] 2016-06-21 23:32:33 +02:00
Dream-Master
123c07aed4 1a87c469af [1a87c46] 2016-06-21 23:31:50 +02:00
Dream-Master
fb484850c9 f11e8300f2 [f11e830] 2016-06-21 23:30:12 +02:00
Dream-Master
bdd30ed34c 8f66f00cb6 [8f66f00] 2016-06-21 23:27:40 +02:00
Dream-Master
a60dbf2302 ea644f2168 [ea644f2] 2016-06-21 23:25:35 +02:00
Dream-Master
10e42abcc0 438d5f39d3 [438d5f3] 2016-06-21 23:17:11 +02:00
Dream-Master
55e302f58d 694a087c75 [694a087] 2016-06-21 23:02:05 +02:00
Dream-Master
bbfad579ae 732172cce8 [732172c] 2016-06-21 22:42:08 +02:00
Dream-Master
5579f21eb3 e4859f2a1f [e4859f2] 2016-06-21 22:36:40 +02:00
Dream-Master
4b3913b175 979a6fb543 [979a6fb] 2016-06-21 22:30:36 +02:00
Dream-Master
e29201f753 new files from gt pull requests 2016-06-21 21:36:03 +02:00
Dream-Master
a88d9c4e72 experimental branch 2016-06-21 21:07:14 +02:00
Dream-Master
fafe1bcc88 reverse commit 2016-06-21 19:32:31 +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
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
c29302347c remove no oxygen component recipe in the ebf because not working. 2016-06-06 00:14:12 +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
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
324b1b56e7 Adding GT:NH Capes 2016-04-18 16:25:35 +02:00
Technus
bf62bffefb Adding GT:NH Capes 2016-04-18 13:28:36 +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
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
Dream-Master
e06633f19f fix 2016-04-16 21:56:49 +02:00
Martin
5b4602eb64 Merge pull request #4 from GTNewHorizons/Paintable-wires
Visualy paintable un-insulated wires
2016-04-16 21:47:11 +02:00
Martin
6596f51a0d Merge pull request #5 from GTNewHorizons/MultiSmelter-Rebalance
Rebalance MultiSmelter to match proc. arrays
2016-04-16 21:47:03 +02:00
Technus
76c555d62c Update GT_Item_Casings_Abstract.java 2016-04-16 20:10:23 +02:00
Technus
a2d27ad80e Update GT_Item_Casings1.java 2016-04-16 20:07:04 +02:00
Technus
7444ea7860 Initial commit
Adding superconductor coil block support with base temperature 9000.
2016-04-16 20:01:01 +02:00
Technus
61e5c04554 Update GT_MetaTileEntity_MultiFurnace.java 2016-04-16 19:45:48 +02:00
Technus
61c97b1e50 Update GT_MetaTileEntity_MultiFurnace.java 2016-04-16 19:39:50 +02:00
Technus
ebb6c613bf Rebalance MultiSmelter to match proc. arrays
added tier 4 coils for whole stack smelting
2016-04-16 19:26:03 +02:00
Technus
3a83a35433 Visualy paintable un-insulated wires 2016-04-16 16:25:45 +02:00
UltraPeeks
79edded171 Fix custom ore mixes more common than intended
The for loop above already registers all custom ore mixes. The first 16 custom mixes were registered a second time and were double as likely as intended to spawn. For example copper was much more difficult to find that way.
2016-04-14 19:04:17 +02:00
Technus
7a047d977a Update GT_Utility.java 2016-04-10 12:09:28 +02:00
Dream-Master
3cf92b0a59 Add Draconium to tag metal 2016-04-09 17:57:17 +02:00
Dream-Master
9b6927e8e3 Fixed Cells recycling
Bump Version
2016-04-09 14:14:32 +02:00
Dream-Master
35b5bb31f9 Revert "adding Adv Miner to us Version"
This reverts commit 6427be7b6d.
2016-04-09 14:02:34 +02:00
Dream-Master
df61939d03 Revert "Try to add Oil Drill. Works but not pumping oil"
This reverts commit 26f65443ff.
2016-04-09 14:02:18 +02:00
Dream-Master
7b0cfabbac fix 2016-04-09 14:00:29 +02:00
Dream-Master
3e6448ff2d Revert "fix the cells recycling recipes"
This reverts commit 55a35613f7.
2016-04-09 13:40:39 +02:00
Dream-Master
cf6f93a5c1 Revert "next try not working yet"
This reverts commit b71a7d48fe.
2016-04-09 13:26:24 +02:00
Dream-Master
b71a7d48fe next try not working yet 2016-04-09 12:23:59 +02:00
Dream-Master
55a35613f7 fix the cells recycling recipes 2016-04-09 11:40:37 +02:00
Dream-Master
e85a2d3e8a change the item filter recipe using 30 instead of 32 eu. 2016-04-09 01:22:43 +02:00