Commit graph

225 commits

Author SHA1 Message Date
Dream-Master
02c801afac fix 2016-06-29 08:48:37 +02:00
Dream-Master
db3b2e1a4a fix adv miner
comit form  perkinslr
2016-06-28 08:49:31 +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
Dream-Master
3d9a779242 fix thanks @Muramasa 2016-06-27 16:56:24 +02:00
Dream-Master
33722641e6 change back name 2016-06-26 11:12:19 +02:00
Logan Perkins
dfb263e7dd Update GT_MetaTileEntity_AdvMiner2.java 2016-06-25 15:43:13 -07:00
Dream-Master
e59aa14e5e fix 2016-06-25 11:26:55 +02:00
Dream-Master
a99ba0e265 Silk-touch then pulverize ores in advanced miner II 2016-06-25 11:25:23 +02: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
Dream-Master
5e1720e282 Revert "make steam boilers not automatable" 2016-06-24 20:44:28 +02:00
Dream-Master
8a3ed09c46 Blood Asp changes 2016-06-24 01:32:57 +02:00
Muramasa
5263c85dc5 Fuel efficiency changes for Large Diesel Engine 2016-06-23 20:02:43 +01: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
759ff09662 9ea49989b6 [9ea4998] 2016-06-22 22:42:28 +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
7cf4b14004 3af174488a [3af1744] 2016-06-22 21:12:55 +02:00
Dream-Master
10a1a2ee47 Adv Mine 2 Texture 2016-06-22 20:30:31 +02:00
Dream-Master
e0fe711de5 b4bfeb21f8 [b4bfeb2] 2016-06-22 19:35:03 +02:00
Techlone
ee2abbd3f2 AdvMinerII: check that ore block still exists; consider chance output 2016-06-22 01:30:27 +05: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
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
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
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
Logan Perkins
f16aeb2d1f Update GT_MetaTileEntity_ProcessingArray.java 2016-06-19 15:58:04 -07:00
Blood-Asp
77a163e0e4 Fix infinite miningpipes exploit from advanced miner 2 2016-06-20 00:21:41 +02:00
Blood-Asp
2427bc1521 Make distillation tower work with different fluids in input hatches 2016-06-19 22:02:19 +02:00
Blood-Asp
6b556371aa Fixed Entchanted Books in magic absorber 2016-06-19 20:36:49 +02:00
Blood-Asp
20201d069a Fixed Magic Energy Absorber efficiency calculation 2016-06-19 20:23:49 +02:00
Blood-Asp
7424f75315 Added missing machines to processing array 2016-06-19 19:15:07 +02:00
Blood-Asp
3a249d8075 Merge pull request #500 from Muramasa-/DieselGenerator
Large Diesel Generator
2016-06-19 17:12:23 +02:00
Techlone
ef23dc90b2 Fix #469 #508 2016-06-19 18:03:01 +05:00
Muramasa
58ed5088e1 Final commit 2016-06-12 19:32:29 +01:00
Logan Perkins
c596231af4 Make processing array use all input stacks 2016-06-12 10:39:33 -07:00
Muramasa
237e5e682d Possibly final commit 2016-06-01 06:34:33 +01:00
Technus
9ea49989b6 Minor Fix
Actually makes the smelt at once cap bigger.
2016-05-30 21:12:25 +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
78c691d754 Adding the New Turbines from Gt 5.09 and some Assembler recipe 2016-05-25 21:43:52 +02:00
Muramasa
680676e411 Redone Tooltips and some scanner info 2016-05-24 00:04:36 +01:00
Muramasa
cddca6e2be Derp 2016-05-23 18:40:01 +01:00
Muramasa
960087a0a8 Cleanup + Improvement 2016-05-23 18:15:21 +01: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
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
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01:00
Blood-Asp
3f46725bbc Fix Butput Bus :P 2016-04-29 20:54:09 +02:00
Muramasa
4a59d0efbd Implemented Output Calculation 2016-04-29 07:31:58 +01:00
Muramasa
6c2c76bd06 Require Titanium Pipe Casing 2016-04-28 02:31:00 +01:00
Muramasa
a62b061968 More Fixes
TODO:
Require Dynamo back centered (Currently anywhere)
Require Muffler top centered (Currently anywhere)
Implement output calculation
Implement coolant requirement (Water or IC2Coolant?)
Possible add different tiers of diesel generator?
2016-04-28 02:16:11 +01:00
Muramasa
76902f45f7 More Cleanup and finalizing 2016-04-28 01:52:46 +01:00
Muramasa
97eb99bd5d Main Commit for Large Diesel Generator 2016-04-28 00:58:55 +01:00
Muramasa
d713c5ddec Remove Diesel Turbine 2016-04-19 23:19:59 +01:00
Muramasa
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01: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
Muramasa
79444adc76 Revert "Turbine Rebalance"
This reverts commit ddc0c4299e.
2016-04-17 07:41:35 +01:00
Muramasa
ddc0c4299e Turbine Rebalance
Added 3 new turbine casings to rebalance the turbines. Also changed
turbine controller recipes to fit the rebalance.

Large Steam: Steel Turbine Casing
Large HP Steam Turbine: Stainless Steel Turbine Casing
Large Gas Turbine: Steel Turbine Casing
Large Diesel Turbine: Titanium Turbine Casing
Large Plasma Turbine: Tungstensteel Turbine Casing
2016-04-17 07:40:10 +01:00
Muramasa
063b62b4ca Fixed newMetaEntity using Plasma Generator 2016-04-17 03:05:58 +01:00
Muramasa
31e4330b69 Large Diesel Generator
Added large diesel generator to the game. It replicates the Large Plasma
Generator but it's nominal output is 1/8 that plasmas is.

Plasma Nominal: Optimal Steam Flow * 40
Diesel Nominal: Optimal Steam Flow * 5
2016-04-17 01:41:06 +01: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
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
Blood-Asp
c98736b7b3 Adding assembly line recipe check 2016-04-11 23:14:57 +02:00
Blood-Asp
22dd09be01 Adding assembly line recipes 2016-04-11 22:30:53 +02:00
Blood-Asp
83344732eb Cleanup 2016-04-11 21:50:01 +02:00
Blood-Asp
3aae928510 Added Assembly Line Multiblock 2016-04-11 21:47:53 +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
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
Blood-Asp
b71fa8f042 advminer2 2016-03-28 03:36:09 +02:00
Blood-Asp
b8579b2ee3 small fixes to distillation tower and advMiner2 2016-03-28 03:35:21 +02:00
Blood-Asp
80d362ceb8 Stop disassembler destroying not electric GT tools 2016-03-27 16:54:11 +02:00
Blood-Asp
44f3e89bdf Rebalance oil processing and improve pipe covering 2016-03-27 16:43:03 +02:00
Blood-Asp
e56a98af45 Update Charcoal pit tooltip 2016-03-27 15:26:36 +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
Blood-Asp
c7c8ba7020 More work on tool hardening 2016-03-20 01:23:03 +01:00
Blood-Asp
20cd83a175 Allow shift rightclick for screwdrivers 2016-03-19 22:15:50 +01:00
Blood-Asp
b4eb7f494f Advanced Miner II fixes 2016-03-18 23:29:24 +01:00
Blood-Asp
df28bd66ec HP Turbine deletes normal steam in input hatch to not get stuck 2016-03-18 22:22:27 +01:00
Blood-Asp
be8d29da74 Fixed turbine output falling when supplying more than opt flow 2016-03-17 00:41:15 +01:00
Blood-Asp
7ac0849c1a Added NC display support for large turbines 2016-03-17 00:28:09 +01:00
Blood-Asp
3e39b7c233 Fix large boiler tooltip 2016-03-16 23:54:23 +01:00
Techlone
fa3e5c0a44 Fix boost of starting of fusion reactors 2016-03-15 13:41:02 +05:00
Blood-Asp
5fd2db9ef2 spelling fixes and chainsaw + forestry leaves fix 2016-01-03 05:27:51 +01:00
Blood-Asp
cf69a7f392 Explosives rework 2016-01-03 02:16:02 +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
af2f74dada increase hot coolant energy output 4x (Blood Asp)
Fix reprocessing exploit (Blood Asp)
2015-12-22 11:42:39 +01:00
Blood-Asp
a448be8d4a increase hot coolant energy output 4x 2015-12-21 22:08:13 +01:00
Blood-Asp
2baf34b03a Fixed AdvMiner II running without drilling fluid 2015-12-21 16:39:11 +01:00
Blood-Asp
8f3c48ed11 fix teleporter and improve seismic prospector 2015-12-13 18:07:59 +01:00
Blood-Asp
55aa306e67 Fix teleporter nuclear control support 2015-12-13 17:45:57 +01:00
Blood-Asp
0bdf8a2e40 removed passive energy use of covers, changed size tooltips and changed comb processing 2015-12-13 16:03:22 +01:00
Blood-Asp
873902f4bf make steam boilers not automateable 2015-12-11 15:25:48 +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
Blood-Asp
ef10c47d76 bunch of fixed
Added new multiblock guis
shortend HP turbine name to fit gui
added reinforced block reprocessing
fixed crash on AE2 removal
expanded large boiler tooltips
fixed chinsel marble processing
added some recipes for alloys
2015-12-06 07:26:06 +01:00
Blood-Asp
899973b0dc Fixed Quantum chest loosing items. 2015-12-05 00:04:54 +01:00
Blood-Asp
063a758961 Mass fabricator fix and Charcoal pit oredict support. 2015-11-25 02:56:23 +01:00
Blood-Asp
d2e2d83156 fixed mark3 fusion overclock 2015-11-24 03:48:28 +01:00
Blood-Asp
cc89e15b5b Fix Seismic prospection without ores failing 2015-11-01 13:46:35 +01:00
Blood-Asp
9b91a89e12 fix pyrolyseoven 2015-10-25 13:50:11 +01:00
Shawn Buckley
123aa6ed28 Reformat code 2015-10-21 22:15:09 -04:00
Shawn Buckley
9353aa711b Reformat code 2015-10-21 22:06:25 -04:00
Shawn Buckley
c68e84f1e2 Remove jdgui-comments 2015-10-21 21:11:56 -04:00
Shawn Buckley
bea4cfc545 Bring in experimental branch 2015-10-21 20:47:13 -04:00
Shawn Buckley
1185424fa7 Move source files 2015-10-21 20:46:52 -04:00
Shawn Buckley
85c804fa11 Move source directory 2015-10-18 23:04:39 -04:00