Commit graph

285 commits

Author SHA1 Message Date
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
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
Dream-Master
7e4aecb65f Change Neutronium Material and add Droconium EFB recipes. 2016-04-30 20:04:07 +02:00
Muramasa
4a59d0efbd Implemented Output Calculation 2016-04-29 07:31:58 +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
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01:00
Dream-Master
334b01dac0 fix #466
Machines higher than IV have a recipe conflict
2016-04-18 00:48:48 +02: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
UltraPeeks
79edded171 Fix custom ore mixes more common than intended
The for loop above already registers all custom ore mixes. The first 16 custom mixes were registered a second time and were double as likely as intended to spawn. For example copper was much more difficult to find that way.
2016-04-14 19:04:17 +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
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
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
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
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
Dream-Master
99595bd912 small fix 2016-03-20 14:48:48 +01:00
Blood-Asp
29b387fbce fix forestry plants above meta 15 2016-03-20 14:40:45 +01:00
Dream-Master
6a09cb1825 Now all slabs works 2016-03-20 14:15:42 +01:00
Dream-Master
ae58de2708 rotors machine recipes.(Blood Asp) 2016-03-20 13:30:02 +01:00
Dream-Master
e5803f8c5a add forestry Bowel recipes (Blood Asp) 2016-03-20 13:10:32 +01:00
Dream-Master
481ed8afe7 Forestry Log with meta id >16 are now nerfed by Greg 2016-03-20 13:06:07 +01:00
Blood-Asp
c7c8ba7020 More work on tool hardening 2016-03-20 01:23:03 +01:00
Blood-Asp
bf5f8258cb Made HV Magic Energy Converter pre Fusion tech(Osmium) 2016-03-18 23:50:58 +01:00
Blood-Asp
c1f5c8c354 Added machine recipe for rotors, added silicone soft hammer 2016-03-18 23:05:38 +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
985130d6f4 Add Uranite crop drop 2016-03-17 23:50:12 +01:00
Blood-Asp
68601d5df9 Fix crop drop autoclave recipes 2016-03-16 23:57:27 +01:00
Blood-Asp
2544d46c91 Fix Forestry woods above meta 15 not effected by wood nerv 2016-03-16 23:49:35 +01: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
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
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
Teteros
d3d2026375 Change 500EU/t recipes to 480EU/t in the EBF.
A tiny fragment of recipes in the Electronic Blast Furnace were set to
500EU/t instead of 480EU/t like all other recipes in the EBF. These were
adjusted since having these deviate from the standard is troublesome for
constant energy needs that the EBF requires.
2016-01-14 00:12:56 +00:00
Teteros
e3453c05a3 Add plastic recipes to Distillation Tower & Distillery.
Distillation tower will now be able to refine ic2biomass and oil to
molten plastic and tiny pile of plastic respectively.
Tiny pile was chosen due to the limitation of 5 fluids and one item in
the distillery, it's equal to '16' molten plastic.

Distillery will refine oil and biomass in a 1:1 ratio to molten plastic,
just like oil to lubricant does. Ratios suggested favour oil more than
biomass.

Remove unused oil types from distillation recipes and set biomass MV
recipe to 32:1000 for easier calculations.
2016-01-13 16:13:37 +00:00
Dream-Master
c5746fe652 Fix recipes Bio Gas 2016-01-11 00:39:10 +01:00
Blood-Asp
de8fbc682d removing tnt ->itnt recipe 2016-01-04 16:18:41 +01:00
Blood-Asp
5fd2db9ef2 spelling fixes and chainsaw + forestry leaves fix 2016-01-03 05:27:51 +01:00
Blood-Asp
63f9e2e457 explosives 2 2016-01-03 02:55:14 +01:00
Blood-Asp
cf69a7f392 Explosives rework 2016-01-03 02:16:02 +01:00
Dream-Master
9c6692c627 This woks 2015-12-31 00:30:29 +01:00
Dream-Master
cd3a4592db Take the Biomass recipes inside the code 2015-12-31 00:12:34 +01:00
Dream-Master
b8cbf1f52d Change Biomass to Gas recipe using 480 eu instead of 512 like all other recipe too. 2015-12-30 14:40:45 +01:00
Dream-Master
e9754ee222 add missing EBXL recipes. tmp disable modular armor recipes(Blood Asp)
AE2 oredict register fix(Blood Asp)
fix depleted mox crashing(Blood Asp)
Bump to 5.08.33.3
2015-12-29 15:29:46 +01:00
Blood-Asp
efbf251938 AE2 oredict register fix 2015-12-29 14:27:52 +01:00
Blood-Asp
87e9feebc3 fix depleted mox crashing 2015-12-29 14:15:32 +01:00
Blood-Asp
b167f73588 fix crop processing like comb processing 2015-12-29 13:38:37 +01:00
Blood-Asp
7abaa97330 add missing EBXL recipes. tmp disable modular armor recipes 2015-12-29 11:59:55 +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
Blood-Asp
f0d8454123 fix armor textures and init 2015-12-28 17:17:52 +01:00
MIUI Russia
9e518a885e New debug lang for achievements generation 2015-12-25 18:21:50 +03:00
Blood-Asp
5132439317 Should save everything before commiting 2015-12-25 15:37:45 +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
Dream-Master
d4da3377ab Revert "Test commit"
This reverts commit 42ba353761.
2015-12-22 22:03:24 +01:00
Dream-Master
42ba353761 Test commit 2015-12-22 22:03:04 +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
a9aac6ff58 comb processing fixes 2015-12-21 19:44:23 +01:00
Blood-Asp
cc3631c8ae Made bees a bit less biome dependend 2015-12-21 16:58:06 +01:00
Blood-Asp
30749ffeba Made UUM Berry drop chance a bit lower 2015-12-21 16:36:42 +01:00
Dream-Master
26c684ce02 remove this from Gt Code 2015-12-17 13:10:19 +01:00
Blood-Asp
259ef97c7c Fix some wrong stone processing 2015-12-15 23:09:34 +01:00
Blood-Asp
f63f1e67ec Fix Emerald crop processing 2015-12-15 22:22:56 +01:00
Blood-Asp
4c8f0c5865 fix stone processing output amounts 2015-12-15 20:19:54 +01:00
Blood-Asp
70e652420d change crop drop processing like bee comb processing 2015-12-13 16: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
Dream-Master
27ee4e8635 Test commit to put Core Mod Items into GT code. 2015-12-13 11:52:02 +01:00
Dream-Master
d9afccdf22 Distillery using now Pipes instead of Blaze Rods. 2015-12-12 08:54:25 +01:00
Blood-Asp
c84559efcc Added processing for UndergroundBiomes stone types 2015-12-11 16:03:05 +01:00
Blood-Asp
370e46215b small fixes 2015-12-11 04:55:22 +01:00
Blood-Asp
6b48991bc6 graphene was overpriced 2015-12-10 16:43:55 +01:00
Blood-Asp
052f9f2961 changed crop stats 2015-12-10 15:37:54 +01:00
Blood-Asp
2d6d8de484 clean up crop classes 2015-12-10 15:30:18 +01:00
Blood-Asp
a7c9f96647 fix thaumium block overwritten, cable error without RF api and cells getting eaten 2015-12-10 15:04:23 +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
3b920fa5a1 Fixed filter recipe and Steelfranks no longer need block below 2015-12-09 00:54:13 +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
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
c79c21aa00 Rebalanced oil/fuel burn values to fit more complex processing 2015-11-30 02:37:05 +01:00
Blood-Asp
4fd0a7f473 Fix forestry compatibility and add luber ability to chainsaw 2015-11-28 20:35:20 +01:00
Blood-Asp
aeff64f935 Merge pull request #334 from doushio9967/slurp-e
Remove duplicate repair achievements, fix HV Pump achievement.
2015-11-25 03:00:18 +01:00
doushio9967
753de8ba94 Remove duplicate repair achievements, fix HV Pump achievement.
Previously any tier pump would trigger the slurp achievement.
No idea why repair was listed thrice.
2015-11-24 07:42:21 +01:00
Blood-Asp
143176dae3 fixed accidental sulfuric acid production 2015-11-24 03:54:21 +01:00
Blood-Asp
df1ffb0211 fixed battery hull crafting/reprocessing 2015-11-24 03:37:00 +01:00
Blood-Asp
593461f5ef fixed typo 2015-11-24 03:14:02 +01:00
Blood-Asp
5d218b68c9 fixed hull recycling 2015-11-24 02:59:04 +01:00
Dream-Master
98566ccee0 Brewing Stand Fix. Items instead of Block. 2015-11-20 19:28:41 +01:00
Dream-Master
abe8b44886 HSLA Steel fix 2015-11-20 19:10:27 +01:00
Dream-Master
bf3a79dc62 New Material Shapeless
HSLA, Hepatizon, Angmallen, Inolashit
2015-11-20 18:09:47 +01:00
Dream-Master
4521769f7b Now finally it works. Why easy when it can be more difficult. 2015-11-20 17:42:17 +01:00
Dream-Master
898a045a97 Change recipes Field generator Tier 1-5
Change recipes Quantum Chest Tier 1-5 (4+5 need to be redone)
Change recipes Quantum Tank Tier 1-5 (4+5 need to be redone)
Change recipes Pump Tier 4+5
2015-11-20 12:29:18 +01:00
Dream-Master
87c81f8d85 Change Name Heavy Duty Alloy Ingot T1
Added Damascus steel, Osmiridium and Shadow Iron to the code
Change Implosion Compressor recipe
Change Large Bronze Boiler recipes
2015-11-20 11:20:00 +01:00
Dream-Master
82f14512d8 fix 2015-11-20 10:25:33 +01:00
Dream-Master
f17905aecc Adding Iron Furnace to the High Pressure Boiler, Bronze Blast Furnace, EBF, Multi smelter and Bronze Alloy Smelter. 2015-11-20 10:20:00 +01:00
Dream-Master
a358097858 Adding Wrench to Bronze and high Pressure Boiler. 2015-11-20 09:58:49 +01:00
Blood-Asp
0c9361193a GT Bee fix + new crop textures. 2015-11-18 01:32:45 +01:00
Dream-Master
1a87c469af fixes again 2015-11-14 14:16:18 +01:00
Dream-Master
f11e8300f2 some fixes again 2015-11-14 13:40:35 +01:00
Dream-Master
8f66f00cb6 fix recipes 2015-11-14 12:54:19 +01:00
Dream-Master
ea644f2168 Rename GalgadorianMetal to Galgadorian
Rename EnhancedGalgadorianMetal to EnhancedGalgadorian
2015-11-14 01:17:16 +01:00
Dream-Master
438d5f39d3 Adding Reinforced Galgadorian and Enhanced Galgadorian to the Material List from GT
Adding Blast Furnace recipes for these materials
Change recipes that Lava gives Tungstate Dust instead of Tungsten Dust
2015-11-14 00:32:58 +01:00
Dream-Master
694a087c75 Integrated Ender IO Alloys into GT (EBF, Mixer, Shapeless) 2015-11-10 16:35:54 +01:00
Dream-Master
5d3b9496df Disabled Rotors (no texture) 2015-11-05 22:49:24 +01:00
Dream-Master
d54baf686a Change nei dependencies 2015-11-03 12:14:50 +01:00
Dream-Master
c32369a8f5 Adding Colant Cells to Gt Mixer
Add Caesium Burn value
Add Block Harvet Level
(copy from Gt 5.09. code)
2015-11-03 12:06:55 +01:00
Blood-Asp
42795f3a24 Fixed NEI dependency. 2015-11-01 15:26:26 +01:00
Blood-Asp
40324b05f9 Fixed ItemFiler OpenGL error. 2015-11-01 14:09:18 +01:00
Blood-Asp
571a8abbe0 Added new crop drops and processing recipes. 2015-11-01 02:47:32 +01:00
Blood-Asp
29fade51aa Forestry update + bee nerv 2015-10-29 00:37:04 +01:00
Blood-Asp
2c178297e8 Added coolant recipes to mixer 2015-10-25 23:08:45 +01:00
Blood-Asp
b7d4d64227 new hydricsulfide -> sulfuricacid recipes 2015-10-24 23:25:00 +02:00
Blood-Asp
3af644dffe Too much U235
Turned some U235Worldgen into U238
2015-10-24 18:53:36 +02:00
Shawn Buckley
1d56c33c86 Fixed spelling of sulfuric gas. Fixes #267 2015-10-23 17:00:18 -04: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
cda516a3e3 Update to Forestry 4 2015-10-21 21:30:33 -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