Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
773 commits 8 branches 203 tags 97 MiB
Commit graph

177 commits

Author SHA1 Message Date
Dream-Master
747c4619d9 f56e821c1b [f56e821] 2016-06-22 22:20:14 +02:00
Dream-Master
c2e5028036 71790e5214 [71790e5] 2016-06-22 22:03:15 +02:00
Dream-Master
1e848d2a4f efa4392b33 [efa4392] 2016-06-22 20:53:15 +02:00
Dream-Master
68fd8c5004 e5803f8c5a [e5803f8] 2016-06-22 19:18:25 +02:00
Dream-Master
ada744c29a d718cac331 [d718cac] 2016-06-22 18:52:27 +02:00
Dream-Master
3eeeee694f d3d2026375 [d3d2026] 2016-06-22 18:27:11 +02:00
Dream-Master
d6f983d922 e3453c05a3 [e3453c0] 2016-06-22 18:14:52 +02:00
Dream-Master
83b346a463 c5746fe652 [c5746fe] 2016-06-22 17:52:59 +02:00
Dream-Master
f658c3b362 Error fixes 2016-06-22 01:33:23 +02:00
Dream-Master
42de6e3af4 9c6692c627 [9c6692c] 2016-06-22 01:05:08 +02:00
Dream-Master
9fde6419f2 cd3a4592db [cd3a459] 2016-06-22 01:03:48 +02:00
Dream-Master
9e9f985b03 abe8b44886 [abe8b44] 2016-06-22 00:42:14 +02:00
Dream-Master
a5ac676111 bf3a79dc62 [bf3a79d] 2016-06-22 00:41:30 +02:00
Dream-Master
cd29cf4da5 4521769f7b [4521769] 2016-06-22 00:39:40 +02:00
Dream-Master
5af854d762 87c81f8d85 [87c81f8] 2016-06-22 00:25:57 +02:00
Dream-Master
123c07aed4 1a87c469af [1a87c46] 2016-06-21 23:31:50 +02:00
Dream-Master
fb484850c9 f11e8300f2 [f11e830] 2016-06-21 23:30:12 +02:00
Dream-Master
bdd30ed34c 8f66f00cb6 [8f66f00] 2016-06-21 23:27:40 +02:00
Dream-Master
a60dbf2302 ea644f2168 [ea644f2] 2016-06-21 23:25:35 +02:00
Dream-Master
10e42abcc0 438d5f39d3 [438d5f3] 2016-06-21 23:17:11 +02:00
Dream-Master
55e302f58d 694a087c75 [694a087] 2016-06-21 23:02:05 +02:00
Dream-Master
a88d9c4e72 experimental branch 2016-06-21 21:07:14 +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
Blood-Asp
6af9d982c8 Notch apple to magic fuel 2016-06-20 00:24:09 +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
3a249d8075 Merge pull request #500 from Muramasa-/DieselGenerator 
Large Diesel Generator
 2016-06-19 17:12:23 +02:00
Muramasa
58ed5088e1 Final commit 2016-06-12 19:32:29 +01:00
Dream-Master
a874d9dd88 so now Oxygen variant works well 
Thanks @Tec
 2016-06-07 16:43:14 +02:00
Dream-Master
7026395900 Revert "remove no oxygen component recipe in the ebf because not working." 
This reverts commit c29302347c.
 2016-06-07 16:09:13 +02:00
Dream-Master
10a02562f2 Revert "so no with the no gas variant." 
This reverts commit 150532cd79.
 2016-06-07 16:09:06 +02:00
Dream-Master
150532cd79 so no with the no gas variant. 2016-06-06 23:10:28 +02:00
Dream-Master
c29302347c remove no oxygen component recipe in the ebf because not working. 2016-06-06 00:14:12 +02:00
Dream-Master
f56e821c1b Make Stainless Steel more expensive to not skip to quick MV Age 2016-05-28 00:17:38 +02:00
Blood-Asp
dc2a48259a Merge pull request #518 from Muramasa-/TweaksAndFixes 
Crash  Fix / Various Tweaks
 2016-05-27 20:11:07 +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
bbcc38e930 More fixes for #507 2016-05-25 19:16:41 +01: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
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
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
Dream-Master
35b5bb31f9 Revert "adding Adv Miner to us Version" 
This reverts commit 6427be7b6d.
 2016-04-09 14:02:34 +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
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
Dream-Master
e5803f8c5a add forestry Bowel recipes (Blood Asp) 2016-03-20 13:10:32 +01:00
Blood-Asp
bf5f8258cb Made HV Magic Energy Converter pre Fusion tech(Osmium) 2016-03-18 23:50:58 +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
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
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
Blood-Asp
5132439317 Should save everything before commiting 2015-12-25 15:37:45 +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
30749ffeba Made UUM Berry drop chance a bit lower 2015-12-21 16:36:42 +01:00
Blood-Asp
f63f1e67ec Fix Emerald crop processing 2015-12-15 22:22:56 +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
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