Commit graph

201 commits

Author SHA1 Message Date
Dream-Master
3cf92b0a59 Add Draconium to tag metal 2016-04-09 17:57:17 +02:00
Dream-Master
9b6927e8e3 Fixed Cells recycling
Bump Version
2016-04-09 14:14:32 +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
7b0cfabbac fix 2016-04-09 14:00:29 +02:00
Dream-Master
3e6448ff2d Revert "fix the cells recycling recipes"
This reverts commit 55a35613f7.
2016-04-09 13:40:39 +02:00
Dream-Master
cf6f93a5c1 Revert "next try not working yet"
This reverts commit b71a7d48fe.
2016-04-09 13:26:24 +02:00
Dream-Master
b71a7d48fe next try not working yet 2016-04-09 12:23:59 +02:00
Dream-Master
55a35613f7 fix the cells recycling recipes 2016-04-09 11:40:37 +02:00
Dream-Master
e85a2d3e8a change the item filter recipe using 30 instead of 32 eu. 2016-04-09 01:22:43 +02:00
Dream-Master
2d54d34aef change malachite to Level one because of the Quests 2016-04-08 17:46:52 +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
Dream-Master
54bdb20c50 Change two textures for the New Cans 2016-04-03 13:50:42 +02:00
Dream-Master
000ae185ec eu fix 2016-04-02 22:41:11 +02:00
Dream-Master
33754091c3 change Cell Fluid amount and materials 2016-04-02 21:50:25 +02:00
Dream-Master
975f9c718f Add more Large Fluid Cells 2016-04-02 14:19:59 +02:00
Dream-Master
f2876a31a3 Try to add a new Fluid Cell to GT 2016-04-02 13:06:18 +02:00
Dream-Master
952c9d72b0 change Objects 2016-04-02 12:48:16 +02:00
Dream-Master
b563a16e71 Fix Rotor recipes and change Thermos Can and large Fluid Cans recipes. 2016-04-02 12:44:38 +02:00
Dream-Master
dc6314f396 Adding Draconic Ores and Draconic Awakened Ores to GT code. 2016-04-02 11:53:15 +02:00
Dream-Master
b61c25be00 Add Draconium and Draconic Awakened 2016-04-01 22:32:20 +02:00
Dream-Master
46320af060 Tool Tips
Adding Draconium to GT
2016-04-01 20:52:48 +02:00
Dream-Master
c1a96e3356 Tool tip 2016-04-01 20:02:42 +02:00
Dream-Master
aeb50268c7 Revert "Cobalt need EBF"
This reverts commit c1f51414c5.
2016-04-01 19:58:45 +02:00
Dream-Master
c1f51414c5 Cobalt need EBF
Change to lv 5
2016-04-01 19:58:07 +02:00
Dream-Master
7218ee8e9e Cobalt need EBF
Change to lv 5
2016-03-22 00:20:53 +01:00
Technus
241ee7e84c not a real commit just updated comments 2016-03-20 22:26:59 +01:00
Technus
f760c9e77b Fix for tile entity names, upped machine cap 2016-03-20 22:01:45 +01:00
Technus
0d1ac677da Add other gt machines support for processing array. 2016-03-20 19:46:23 +01:00
Dream-Master
99595bd912 small fix 2016-03-20 14:48:48 +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
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
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
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
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
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
0c36ac30b7 Backdate to Forestry 3 because using the GT Centrifuge for Bee products too 2015-11-04 20:24:18 +01:00
Dream-Master
732172cce8 Ardite no EBF recipe 2015-11-03 12:36:39 +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
Dream-Master
e4859f2a1f change Material List again 2015-11-03 11:55:38 +01:00
Dream-Master
979a6fb543 Change Material List
Adding Planets Oremixes to the lang file
change build properties
2015-11-03 11:28:31 +01:00
Shawn Buckley
46f4473de6 Change if chains to switches 2015-10-25 09:27:29 -04:00
Shawn Buckley
756e7edc64 Fix version for stable build 2015-10-24 13:45:06 -04:00
Blood-Asp
2d7a108727 fixed naquadah cell reverse processing 2015-10-24 13:41:56 -04:00
Shawn Buckley
123aa6ed28 Reformat code 2015-10-21 22:15:09 -04:00
Shawn Buckley
ad473b9ac0 Update IC2 Nuclear control to 2.3.1a-Butt 2015-10-20 21:23:33 -04:00
Blood-Asp
57efa552e7 Merge pull request #253 from JonnyNova/tf_squash
Replace GT_Values.T/F with java primitive boolean values
2015-10-20 22:47:09 +02:00
Blood-Asp
70c116c3df update to forestry 4.0 2015-10-20 22:46:18 +02:00
Shawn Buckley
49e6015068 Replace GT_Values.T/F with java primitive boolean values 2015-10-19 20:48:52 -04:00
Shawn Buckley
7150103150 Replace homegrown character comparision for builtin ones 2015-10-19 19:49:28 -04:00
Shawn Buckley
85c804fa11 Move source directory 2015-10-18 23:04:39 -04:00