Commit graph

1159 commits

Author SHA1 Message Date
Muramasa
240d346883 Fixes #367 by adding missing buttons to guis 2016-05-24 21:59:42 +01:00
Muramasa
0fadfa2543 Fixes #501 2016-05-24 21:37:46 +01:00
Muramasa
3c32671623 Crash Fix 2016-05-24 00:05:20 +01: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
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
Muramasa
4fdbf01fae My client likes to uncheck files 2016-05-20 05:37:43 +01:00
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01:00
OneEyeMaker
5169c509d6 Added configuration file to enabling processing of ores 2016-05-18 07:41:36 +03:00
MauveCloud
b2e564412f Added missing assembler recipes for casings
Added missing assembler recipes for casings: Basic Machine Casing, UV
Machine Casing, Heat Proof Machine Casing, Cupronickel Coil Block,
Kanthal Coil Block, Nichrome Coil Block, Superconducting Coil Block,
Solid Steel Machine Casing, Frost Proof Machine Casing, Robust
Tungstensteel Casing, Clean Stainless Steel Casing, Stable Titanium
Casing, Fusion Casing, Turbine Casing, Stainless Steel Turbine Casing,
Titanium Turbine Casing, Tungstensteel Turbine Casing
2016-05-12 14:24:04 -07:00
Techlone
34c5fd807d Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental 2016-05-02 15:14:10 +05:00
Dream-Master
7e4aecb65f Change Neutronium Material and add Droconium EFB recipes. 2016-04-30 20:04:07 +02:00
Blood-Asp
3f46725bbc Fix Butput Bus :P 2016-04-29 20:54:09 +02:00
Blood-Asp
27eb1c67e4 Merge pull request #499 from MauveCloud/experimental
Improved output bus handling
2016-04-29 20:42:55 +02:00
Muramasa
4a59d0efbd Implemented Output Calculation 2016-04-29 07:31:58 +01:00
MauveCloud
b69385d29b Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental 2016-04-28 11:30:29 -07:00
MauveCloud
a88988770b Improved brittle charcoal handling. 2016-04-28 11:30:00 -07: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
MauveCloud
9036858017 Improved output bus handling 2016-04-27 17:31:20 -07:00
Muramasa
97eb99bd5d Main Commit for Large Diesel Generator 2016-04-28 00:58:55 +01:00
Blood-Asp
5c8eec846d Merge pull request #493 from Muramasa-/TurbineCasingRebalance
Turbine casing rebalance
2016-04-27 21:18:29 +02:00
Blood-Asp
fd99216b35 Merge pull request #497 from MauveCloud/experimental
Added Crop Calculator support.
2016-04-27 21:18:05 +02:00
MauveCloud
784c65a884 Added Crop Calculator support. 2016-04-26 13:30:26 -07:00
Muramasa
cb962573e2 Missed a file 2016-04-19 23:31:41 +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
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