Commit graph

266 commits

Author SHA1 Message Date
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
Dream-Master
32f416a2e6 Adding Forestry 4 support 2016-03-20 12:59:43 +01:00
Teteros
7c3fdb2ebc Synchronize with Blood-Asps' repository 2016-02-29 03:55:05 +00:00
Teteros
cd3357c73f Omit already applied fixes
This reverts commit d415df7ea2.
2016-02-29 03:32:40 +00:00
Dream-Master
76179293b6 Bump Version 2016-02-10 22:53:47 +01:00
Dream-Master
c1fd3d5800 Merge remote-tracking branch 'origin/Teteros/Recipes' 2016-02-10 22:51:09 +01:00
Dream-Master
04b5d32fe0 Added Thaumcraft Void Metal to GT 2016-02-10 22:50:21 +01:00
Blood-Asp
51bf5d55d6 Merge pull request #427 from leagris/master
Fix textures in wrong BMP format to PNG
2016-01-30 14:39:55 +01:00
Léa Gris
af5cef9c05 Fix textures in wrong BMP format to PNG
Script to fix
```Bash
list=$(find ./ -type f -name \*.png -exec grep -l BM6 {} \;)
for v in $list
do
  f=$(echo $v | sed -e 's/\(.*\)\.png/\1/g')
  mv "$f.png" "$f.bmp"
  convert "$f.bmp" "$f.png"
  find ./ -type f -name "$f.bmp" -delete
done
```
2016-01-29 15:09:07 +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
Dream-Master
c8c0a128fb Bump Version 2016-01-06 00:36:04 +01:00
Dream-Master
abc6cfc291 recipe Change for Drain and the Shutter Module #438 2016-01-05 21:28:08 +01:00
Dream-Master
4e96c8325f Fix forestry worktable crash(Blood Asp) 2016-01-05 21:02:58 +01:00
Dream-Master
1f4f33837d fix Platinum derp #437 2016-01-05 21:00:28 +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
d741647dbe Now Mox cells working like in ic2 2015-12-30 01:05:10 +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
Dream-Master
1b6f3ab64d Revert "Fixed world event lag and related cauldron crash (LemADEC)"
This reverts commit 10d1e48220.
2015-12-29 15:20:14 +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
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
10d1e48220 Fixed world event lag and related cauldron crash (LemADEC) 2015-12-22 11:49:48 +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
Dream-Master
26c684ce02 remove this from Gt Code 2015-12-17 13:10:19 +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
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
d415df7ea2 merge of GT5.09 fixes into 5.08 branch 2015-12-09 00:52:00 +01:00
Dream-Master
2cab6b8166 Fixed the Field generators 1-5, fitting more in the Tiers. 2015-11-20 20:07:34 +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
543f71cc97 fix 2015-11-20 13:42:48 +01:00
Dream-Master
b0e7ffa8e5 Added T2 and T3 Alloy Ingots to the Assembler
Change Implosions Compressor Recipes for T2+T3 Ingots
New Version for testing.
2015-11-20 13:27:06 +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
Dream-Master
91d34c2c68 New Nerfed Small Gears and Ring recipes into GT code. 2015-11-20 09:41:17 +01:00
Dream-Master
ae4ec23ece fix name 2015-11-15 22:42:07 +01:00
Dream-Master
1a87c469af fixes again 2015-11-14 14:16:18 +01:00