Commit graph

64 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dream-Master
26f65443ff Try to add Oil Drill. Works but not pumping oil 2016-04-04 22:33:30 +02:00
Dream-Master
6427be7b6d adding Adv Miner to us Version
adding Drilling Fluid
added a few Textures from Gt 5.09
2016-04-04 20:04:53 +02:00
Dream-Master
000ae185ec eu fix 2016-04-02 22:41:11 +02:00
Dream-Master
33754091c3 change Cell Fluid amount and materials 2016-04-02 21:50:25 +02:00
Dream-Master
975f9c718f Add more Large Fluid Cells 2016-04-02 14:19:59 +02:00
Dream-Master
f2876a31a3 Try to add a new Fluid Cell to GT 2016-04-02 13:06:18 +02:00
Dream-Master
952c9d72b0 change Objects 2016-04-02 12:48:16 +02:00
Dream-Master
b563a16e71 Fix Rotor recipes and change Thermos Can and large Fluid Cans recipes. 2016-04-02 12:44:38 +02:00
Dream-Master
46320af060 Tool Tips
Adding Draconium to GT
2016-04-01 20:52:48 +02:00
Technus
241ee7e84c not a real commit just updated comments 2016-03-20 22:26:59 +01:00
Technus
f760c9e77b Fix for tile entity names, upped machine cap 2016-03-20 22:01:45 +01:00
Technus
0d1ac677da Add other gt machines support for processing array. 2016-03-20 19:46:23 +01:00
Teteros
d718cac331 Modify Wet Concrete to be able to use cells
Wet Concrete was lacking cell support as it was a 'molten' fluid type.

This patch adds a new type 'wet', which replaces 'molten'
for Concrete. This means with this patch you can either use
the canner with concrete dust to fill the cell, or the fluid
canning machine to input or output Wet Concrete.

Ideally Wet Concrete would be separate from Concrete as one is solid and
the other fluid, but they were kept together for compatibility with
existing recipes. 1 Concrete Cell = 144 Wet Concrete = Concrete Block

'Wet' fluid type can be used anytime you'd like both solid and fluid
cell support, as these were usually separate for good reasons.
Mostly to prevent the awkward ratio above.
2016-01-14 06:14:53 +00:00
Dream-Master
abc6cfc291 recipe Change for Drain and the Shutter Module #438 2016-01-05 21:28:08 +01:00
Dream-Master
1b6f3ab64d Revert "Fixed world event lag and related cauldron crash (LemADEC)"
This reverts commit 10d1e48220.
2015-12-29 15:20:14 +01:00
Dream-Master
faa4c18f63 Added Blood Asps commits.
New debug lang for achievements generation(miuirussia)
fuel rod override v2(Blood Asp) Mox not working lik ic2 any more (more heat up more eu)
Overriding IC2 fuel rods(Blood Asp)
fix teleporter(Blood Asp)
Sensor kit should not stack(Blood Asp)
Fix teleporter nuclear control support(Blood Asp)
Fixed Display overflow(Blood Asp)
2015-12-28 21:04:13 +01:00
Dream-Master
10d1e48220 Fixed world event lag and related cauldron crash (LemADEC) 2015-12-22 11:49:48 +01:00
Dream-Master
af2f74dada increase hot coolant energy output 4x (Blood Asp)
Fix reprocessing exploit (Blood Asp)
2015-12-22 11:42:39 +01:00
Dream-Master
26c684ce02 remove this from Gt Code 2015-12-17 13:10:19 +01:00
Dream-Master
27ee4e8635 Test commit to put Core Mod Items into GT code. 2015-12-13 11:52:02 +01:00
Dream-Master
55ed43f4ce Added all fixes from Blood Asp we need. Just stay at Forestry 3.6.12.3 2015-12-10 01:12:42 +01:00