Commit graph

218 commits

Author SHA1 Message Date
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01: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
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
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
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01: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
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
3aae928510 Added Assembly Line Multiblock 2016-04-11 21:47:53 +02:00
Draknyte1
523d2c449e Should fix any issues. 2016-04-11 20:34:56 +10:00
Draknyte1
1d279c741f Made these up to date with latest experimental commit, as mine were slightly out of date. :) 2016-04-10 19:15:41 +10:00
Draknyte1
26e60b7020 Changed a few things to make the Soft Hammer more noticeable from the Hard Hammer.
Now it's a soft Mallet with an inverted icon, as requested by @DarknessShadow - https://github.com/Blood-Asp/GT5-Unofficial/issues/407

# Conflicts:
#	src/main/java/gregtech/api/enums/OrePrefixes.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
2016-04-10 18:36:52 +10:00
Blood-Asp
af20a2e4ab Show all ingot fluid extractions and all iron/copper arc furnace recipes 2016-03-27 17:50:10 +02:00
Blood-Asp
44f3e89bdf Rebalance oil processing and improve pipe covering 2016-03-27 16:43:03 +02:00
Blood-Asp
b2ac24e85a Tooltip fix 2016-03-20 17:08:33 +01:00
Blood-Asp
009c032c13 Hiding of Recycling recipes and unneeded ores in NEI 2016-03-20 16:47:17 +01:00
Blood-Asp
c7c8ba7020 More work on tool hardening 2016-03-20 01:23:03 +01:00
Blood-Asp
f4b8aa6f3a Add Fluid Filter and Regulator covers 2016-03-19 20:51:20 +01:00
Blood-Asp
c1f5c8c354 Added machine recipe for rotors, added silicone soft hammer 2016-03-18 23:05:38 +01:00
Blood-Asp
e8f0482b16 Dynamite impcomp and fluid mox fixes 2016-03-18 22:43:22 +01:00
Blood-Asp
a80e44f7f5 Added sharpness enchantment for HSS material tools 2016-03-17 00:49:47 +01:00
Blood-Asp
0a6e69e254 Rised crop root length to match IC2 again 2016-03-16 23:52:52 +01:00
Blood-Asp
9e7f34a12f Fix heavy oil gen without messing everything up 2016-03-16 22:49:15 +01:00
Blood-Asp
a475c87f17 Fixed heavy oil not generated 2016-01-30 14:39:08 +01:00
Blood-Asp
4537392c10 Reserving Meta IDs 2016-01-10 14:18:16 +01:00
Blood-Asp
874dfdc309 Fix forestry worktable crash 2016-01-03 16:49:00 +01: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
Blood-Asp
9362235140 fix mox output not rising with heat 2015-12-29 14:42:13 +01:00
Blood-Asp
f0d8454123 fix armor textures and init 2015-12-28 17:17:52 +01:00
Blood-Asp
1e13709399 fuel rod override v2 2015-12-25 15:09:22 +01:00
Blood-Asp
68a19fd70c Overriding IC2 fuel rods 2015-12-25 14:37:56 +01:00
Blood-Asp
a9aac6ff58 comb processing fixes 2015-12-21 19:44:23 +01:00
Blood-Asp
9781ccd9ee fix crash without rf api 2015-12-21 18:44:07 +01:00
Blood-Asp
30749ffeba Made UUM Berry drop chance a bit lower 2015-12-21 16:36:42 +01:00
Blood-Asp
a7176a293c Fix reprocessing exploit 2015-12-21 16:30:46 +01:00
Blood-Asp
2bf2ecc35e Sensor kit should not stack 2015-12-13 17:56:22 +01:00
Blood-Asp
8722e0e2f2 Fixed Display overflow 2015-12-13 17:35:07 +01:00
Blood-Asp
02e556598e fixed ore achievements not working with custom ores 2015-12-10 21:02:37 +01:00
Blood-Asp
6b2e08b2ca shift + screwdriver for all covers 2015-12-10 18:25:07 +01:00
Blood-Asp
2d6d8de484 clean up crop classes 2015-12-10 15:30:18 +01:00
Blood-Asp
8176a5fca9 cable burn fix and ihl compat fix 2015-12-08 23:39:41 +01:00
Blood-Asp
8078bca4b3 Moved Sulfide ore processing from IHL to GT 2015-12-06 22:37:25 +01:00
Blood-Asp
27b978f0bb tmp issue fix 2015-12-06 21:20:23 +01:00
Blood-Asp
aeb505273b Saving pumped oil amounts in chunk NBTs 2015-12-06 21:15:41 +01:00
Blood-Asp
66427b2178 fix fluidstack memory overflow 2015-12-06 18:37:10 +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
1ef11f2ae4 More recycler blacklisted items and ignored additional oredict because of crossmod issue 2015-12-05 00:55:46 +01:00
Blood-Asp
a625088776 Fix BasicMachines accepting wrong items in certain conditions 2015-12-05 00:33:52 +01:00
Blood-Asp
3106bfe8a2 Fix CarbonDioxide, lower outputstacksize by screwdriver + shift and hide blocks without materials 2015-12-04 22:44:27 +01:00
Blood-Asp
c79c21aa00 Rebalanced oil/fuel burn values to fit more complex processing 2015-11-30 02:37:05 +01:00
Blood-Asp
571a8abbe0 Added new crop drops and processing recipes. 2015-11-01 02:47:32 +01:00
Blood-Asp
bc86770624 added config to disable crops 2015-11-01 01:57:09 +01:00
Blood-Asp
29fade51aa Forestry update + bee nerv 2015-10-29 00:37:04 +01:00
Blood-Asp
8d8594dabd GT Wrench now implements Buildcrafts Wrench IToolWrench 2015-10-25 23:56:58 +01:00
Blood-Asp
a2ad9c9e83 fixed naquadah cell reverse processing 2015-10-24 18:41:53 +02:00
Blood-Asp
8f851f0f68 Made Materials human readable again 2015-10-24 17:32:16 +02:00
Shawn Buckley
9353aa711b Reformat code 2015-10-21 22:06:25 -04:00
Shawn Buckley
445e6c3f25 Replace T/F with builtin boolean values 2015-10-21 22:01:39 -04:00
Shawn Buckley
c68e84f1e2 Remove jdgui-comments 2015-10-21 21:11:56 -04:00
Shawn Buckley
34ecdfb190 Replace homegrown character comparision for builtin ones 2015-10-21 20:58:55 -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