Commit graph

362 commits

Author SHA1 Message Date
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
Blood-Asp
01b15f4251 Make Railcraft item Retrival name independent 2016-06-25 00:24:25 +02:00
Blood-Asp
e21311b919 Fix Superfuel railcraft compat and expand thaumcraft check 2016-06-24 17:49:22 +02:00
Blood-Asp
cea067c613 More superfuel fixes 2016-06-24 01:08:26 +02:00
Blood-Asp
25a0b460d4 Fix fluiddeath 2016-06-24 00:57:45 +02:00
Blood-Asp
df6e07b5cd Merge pull request #537 from Muramasa-/DieselGenerator
Fuel efficiency changes for Large Diesel Engine
2016-06-24 00:41:46 +02:00
Blood-Asp
104715c86c missed a bit 2016-06-23 23:44:07 +02:00
Blood-Asp
72ff25f9b7 Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block fuel values 2016-06-23 23:43:22 +02:00
Muramasa
5263c85dc5 Fuel efficiency changes for Large Diesel Engine 2016-06-23 20:02:43 +01:00
Blood-Asp
210fc268b1 Remove old crop processing code 2016-06-23 19:31:02 +02:00
Blood-Asp
1d9eb4093e Readjusted Notch Apple fuel value 2016-06-23 18:45:59 +02:00
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Techlone
ee2abbd3f2 AdvMinerII: check that ore block still exists; consider chance output 2016-06-22 01:30:27 +05: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
Blood-Asp
5728c8d93f Merge pull request #534 from Muramasa-/DieselGenerator
Bug Fixes
2016-06-21 19:56:20 +02:00
Blood-Asp
75d71e546b Fix fced86e11a hiding almost all metaitems 2016-06-21 19:51:54 +02:00
Muramasa
434450107b This client likes to uncheck files 2016-06-21 18:28:29 +01:00
Muramasa
6e656668cc Wrong pipe oredict 2016-06-21 00:35:10 +01: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
f708fc5ff8 Corrected Wood Plates burn value 2016-06-20 00:40:00 +02:00
Blood-Asp
d61667d436 Improved Ultimet stats 2016-06-20 00:39:42 +02:00
Blood-Asp
6af9d982c8 Notch apple to magic fuel 2016-06-20 00:24:09 +02:00
Blood-Asp
77a163e0e4 Fix infinite miningpipes exploit from advanced miner 2 2016-06-20 00:21:41 +02:00
Blood-Asp
dcfa9c5df9 nerfed biogas from distillery 2016-06-20 00:11:29 +02:00
Blood-Asp
8269cd58e6 Fix wrong energy values for comp and crop processing 2016-06-20 00:07:55 +02:00
Blood-Asp
9887777ddd Cheaper chemical string production 2016-06-20 00:05:22 +02:00
Blood-Asp
491a6d6c4b Plunger also emptys input tank after output tank is empty 2016-06-19 22:44:28 +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
91fc3a20cd Implement IBoxable for radioactive componentes 2016-06-19 20:49:52 +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
e340d17337 Improved Neutronium for being highest tier material 2016-06-19 19:55:22 +02:00
Blood-Asp
537d6e9330 changed plasma turbine damage and added config 2016-06-19 19:43:14 +02:00
Blood-Asp
87ef0280f0 Remove unused recipe code 2016-06-19 19:34:26 +02:00
Blood-Asp
7424f75315 Added missing machines to processing array 2016-06-19 19:15:07 +02:00
Blood-Asp
ffd9964cd3 Changed Bittle charcoal tool back to axe 2016-06-19 19:02:48 +02:00
Blood-Asp
f2525afb8d Moved Bee init earlier 2016-06-19 18:29:59 +02:00
Blood-Asp
96607760e1 EnderIO Wrench Support 2016-06-19 18:23:28 +02:00
Blood-Asp
1ace2c4e35 Blacklist Unstable Ingots from unification 2016-06-19 17:42:43 +02:00
Blood-Asp
183a681d52 IC2 Single-Use battery support 2016-06-19 17:36:54 +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
54ae577be0 Make recipe input work for split stacks 2016-06-12 10:41:52 -07: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
Blood-Asp
dc2a48259a Merge pull request #518 from Muramasa-/TweaksAndFixes
Crash  Fix / Various Tweaks
2016-05-27 20:11:07 +02:00
Blood-Asp
35a7a99808 Merge pull request #515 from OneEyeMaker/OreProcessing
Added configuration file, that enables processing of ores
2016-05-27 20:07:37 +02:00
Blood-Asp
d4f00173e5 Merge pull request #511 from MauveCloud/experimental
Added missing assembler recipes for casings
2016-05-27 20:04:40 +02:00
MauveCloud
d1b737c6cc Fixed incomplete redo of brittle charcoal adventure fix
(had reverted after improper testing with axe instead of shovel, then
neglected to check rebuilding with gradle after re-implementing fix in
source)
2016-05-26 09:57:39 -07:00
MauveCloud
f5bb397009 Reinforced Block and Brittle Charcoal fixes
Added fixes for #503 and #436
2016-05-26 07:43:02 -07:00
Muramasa
79fc84d5d2 isPlasmaCellUsed additional null check 2016-05-26 00:55:34 +01:00
Muramasa
fced86e11a Fixes #268. Shows plasma cells that have a fusion recipe 2016-05-26 00:52:09 +01:00
Muramasa
ab6c431b88 Rearranged two achievements. Fixes #478 2016-05-25 22:25:24 +01:00
Muramasa
bbcc38e930 More fixes for #507 2016-05-25 19:16:41 +01:00
Muramasa
2cad97e975 Fixes #507 2016-05-24 22:02:46 +01:00
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
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
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
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
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
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
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
Alkalus
e634563157 Update ProcessingPipeMedium.java
Apparently it has a newline at the end.
2016-04-11 20:54:52 +10:00
Alkalus
f1af2039bb Update ProcessingPipeSmall.java
Apparently it has a newline at the end.
2016-04-11 20:54:45 +10:00
Alkalus
63d70c3ff0 Update ProcessingPipeLarge.java
Apparently it has a newline at the end.
2016-04-11 20:54:27 +10:00
Draknyte1
36a97e706b Submitting PR's is a pain.
Always use most up to date files for the repo you're contributing to. #NotGT5.8Files
2016-04-11 20:47:30 +10:00
Draknyte1
0f8d8b95d1 Merge branch 'UpToDateGTPRBranch' of https://github.com/draknyte1/GT5-Unofficial into UpToDateGTPRBranch 2016-04-11 20:36:08 +10:00
Draknyte1
523d2c449e Should fix any issues. 2016-04-11 20:34:56 +10:00
Alkalus
ba1f0f99ab Update GT_MetaGenerated_Tool_01.java
left a : not a ;
2016-04-10 19:29: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
Léa Gris
aa922c5470 Re Fix #472 #219 2016-04-04 18:43:35 +02:00
Léa Gris
8a2406de8a Fix #472 #219 2016-04-04 18:20:54 +02:00
Blood-Asp
9e5819e931 made EV charger recipe oredict 2016-04-02 16:18:08 +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
af20a2e4ab Show all ingot fluid extractions and all iron/copper arc furnace recipes 2016-03-27 17:50:10 +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
Blood-Asp
6e0f90964e Fix regulator crafting recipes 2016-03-20 23:34:09 +01:00
Blood-Asp
b2ac24e85a Tooltip fix 2016-03-20 17:08:33 +01:00
Blood-Asp
41af922dd2 Gunpowder no longer unlocks clean dust achievement 2016-03-20 16:51:01 +01:00
Blood-Asp
009c032c13 Hiding of Recycling recipes and unneeded ores in NEI 2016-03-20 16:47:17 +01:00
Blood-Asp
ac258896de remove console print 2016-03-20 14:59:07 +01:00
Blood-Asp
529c28649a Fix item detector not working correctly 2016-03-20 14:57:51 +01:00
Blood-Asp
29b387fbce fix forestry plants above meta 15 2016-03-20 14:40:45 +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
f4b8aa6f3a Add Fluid Filter and Regulator covers 2016-03-19 20:51:20 +01:00
Blood-Asp
bf5f8258cb Made HV Magic Energy Converter pre Fusion tech(Osmium) 2016-03-18 23:50:58 +01:00
Blood-Asp
b4eb7f494f Advanced Miner II fixes 2016-03-18 23:29:24 +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
e51cd6433d wildcard lathe recipes 2016-03-18 22:37:26 +01:00
Blood-Asp
32d4542fbc Added bowl lathe recipes 2016-03-18 22:29:57 +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
985130d6f4 Add Uranite crop drop 2016-03-17 23:50:12 +01:00
Blood-Asp
a8f91902d1 Improved Sense 2016-03-17 23:35:10 +01:00
Blood-Asp
cd61ff3ae1 Made Large fluid cells stack more and cheaper to build 2016-03-17 00:53:28 +01:00
Blood-Asp
a80e44f7f5 Added sharpness enchantment for HSS material tools 2016-03-17 00:49:47 +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
68601d5df9 Fix crop drop autoclave recipes 2016-03-16 23:57:27 +01:00
Blood-Asp
3e39b7c233 Fix large boiler tooltip 2016-03-16 23:54:23 +01:00
Blood-Asp
0a6e69e254 Rised crop root length to match IC2 again 2016-03-16 23:52:52 +01:00
Blood-Asp
2544d46c91 Fix Forestry woods above meta 15 not effected by wood nerv 2016-03-16 23:49:35 +01:00
Blood-Asp
9e7f34a12f Fix heavy oil gen without messing everything up 2016-03-16 22:49:15 +01:00
Techlone
fa3e5c0a44 Fix boost of starting of fusion reactors 2016-03-15 13:41:02 +05:00
Nidan
b43cfa2a0c Small Crop stats rebalance
- make Trollplant obtainable again (1% chance)
- make Transformium very rare instead of almost impossible to get (0.668% instead of 0.134%)
- make Zomplant uncommon instead of very rare (1.5% instead of 0.618%)
- adjust Fertilia to remain reachable, making it a bit less rare in the process (0.967% instead of 0.794%)
(chances given are for the best possible parents; in case of Zomplant excluding Fertilia as it can only be obtained from Zomplant)
2016-03-05 19:55:22 +01:00
Blood-Asp
1ac152cbce Merge pull request #442 from miuirussia/patch-3
Fixed load textures
2016-03-04 06:07:24 +01:00
Blood-Asp
dae68a771b Merge pull request #441 from leagris/experimental
Fix EnderIO EBF Recipes tier
2016-03-04 06:07:02 +01:00
MIUI Russia
1e747853c4 Fixed load textures 2016-03-01 23:07:54 +03:00
Léa Gris
f907c2af80 Fix EnderIO EBF Recipes tier
EnderIO: ElectricalSteel and DarkSteel ingot where at HV tier in EBF.
These mid-game low tech materials should be on HV tech.
Also these recipes are not removed from EnderIO itself where they default to very easy process in EnderIO AlloySmelter.
2016-02-29 10:26:33 +01:00
Blood-Asp
a475c87f17 Fixed heavy oil not generated 2016-01-30 14:39:08 +01:00
Blood-Asp
f385b880bd Adding last missing modular armor textures 2016-01-16 17:43:44 +01:00
Blood-Asp
4537392c10 Reserving Meta IDs 2016-01-10 14:18:16 +01:00
Blood-Asp
de8fbc682d removing tnt ->itnt recipe 2016-01-04 16:18:41 +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
dd6e61da16 small fix on armor display. 2016-01-03 03:19:47 +01:00