Commit graph

1232 commits

Author SHA1 Message Date
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
Blood-Asp
a475c87f17 Fixed heavy oil not generated 2016-01-30 14:39:08 +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
Blood-Asp
f385b880bd Adding last missing modular armor textures 2016-01-16 17:43:44 +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
4537392c10 Reserving Meta IDs 2016-01-10 14:18:16 +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
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
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
Blood-Asp
ab3e305e1a More new modular armor textures. 2016-01-02 21:33:57 +01:00
Blood-Asp
9ecef862e0 New Modular Armor models 2016-01-02 12:28:06 +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
Blood-Asp
9362235140 fix mox output not rising with heat 2015-12-29 14:42:13 +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
Blood-Asp
1246bf2838 Merge pull request #391 from Blood-Asp/revert-372-experimental
Revert "Fixed world event lag and related cauldron crash"
2015-12-29 11:58:51 +01:00
Blood-Asp
177adcbf32 Revert "Fixed world event lag and related cauldron crash" 2015-12-29 11:57:53 +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
e8ba86746a Name fix 2015-12-28 17:17:51 +01:00
Blood-Asp
4cb9f2c2ba Merge pull request #377 from miuirussia/patch-2
New debug lang for achievements generation
2015-12-25 16:48:41 +01:00
MIUI Russia
9e518a885e New debug lang for achievements generation 2015-12-25 18:21:50 +03:00
Blood-Asp
1464b07b36 Merge pull request #376 from miuirussia/patch-1
More beautiful achievements display
2015-12-25 16:15:30 +01:00
Blood-Asp
a4bf359b03 Initial Modular armor port (from GTExtras) 2015-12-25 16:14:52 +01: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
MIUI Russia
a582991c10 More beautiful achievements display 2015-12-24 19:05:43 +03:00