Commit graph

134 commits

Author SHA1 Message Date
OneEyeMaker
cda6044614 c4bd35d7cd 2016-07-26 17:07:31 +02:00
OneEyeMaker
9946e904b4 Merge branch 'experimental' into NewFeatures 2016-07-26 09:01:16 +03:00
OneEyeMaker
c4bd35d7cd Coils should be deprecated 2016-07-26 07:31:57 +03:00
Muramasa
16cac26b72 Separated multiblock overlay and gui textures 2016-07-26 00:52:30 +01:00
OneEyeMaker
c485ef4720 b6e4f869b8 2016-07-25 23:13:40 +02:00
OneEyeMaker
1f1664152c 47ce855868 2016-07-25 22:55:51 +02:00
OneEyeMaker
d0396c268c f98e51a82f 2016-07-25 22:53:13 +02:00
OneEyeMaker
718d28bd23 ea5305f7df 2016-07-25 22:36:29 +02:00
OneEyeMaker
218d45c99d b780ef6c2c 2016-07-25 22:23:13 +02:00
OneEyeMaker
49c063f24a c9bc17bce5 2016-07-25 22:18:51 +02:00
OneEyeMaker
b6e4f869b8 Redesigned achievements. 2016-07-24 15:47:50 +03:00
Muramasa
676e326ec0 Various fixes/cleanup
Game will no longer crash without UBC loaded
Added missing mallet textures to materialicon Lignite
2016-07-22 01:41:51 +01:00
OneEyeMaker
47ce855868 Redefined some wires. Added last heating coil block. 2016-07-21 08:48:22 +03:00
OneEyeMaker
f98e51a82f Added new tier of heating coils.
//TODO: Find material for LuV coils.
2016-07-20 10:27:47 +03:00
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
b780ef6c2c Updated tooltips 2016-07-17 16:16:43 +03:00
OneEyeMaker
c9bc17bce5 Added new heating coil blocks. 2016-07-17 15:20:29 +03:00
Muramasa
51e269e3f5 Initial
This is more of a test and resource for when I eventually rewrite the
GT5U ore texture/metadata system.
2016-07-16 23:48:25 +01:00
Dream-Master
4030ef4f1c Change graphic 2016-07-05 19:58:04 +02:00
Dream-Master
509b904d4e Change graphics 2016-07-05 19:54:33 +02:00
Dream-Master
c579f73733 Add Argon Gas 2016-07-02 11:36:58 +02:00
Blood-Asp
c2be6ff64c Small fixes and rebalances 2016-07-01 21:44:44 +02:00
Blood-Asp
bcbeebf3b8 First Assemblyline recipes 2016-07-01 02:06:51 +02:00
Blood-Asp
b465f8f25c Adding LuV, ZPM and UV components 2016-07-01 01:41:28 +02:00
Dream-Master
8a3ed09c46 Blood Asp changes 2016-06-24 01:32:57 +02:00
Blood-Asp
72ff25f9b7 Add new Fuel, Fix emitter and field gen recipes, add charcoal/lignite block fuel values 2016-06-23 23:43:22 +02:00
Dream-Master
ce97f9d852 Fix Fluid Wet Concrete
remove Plasma Pie we have Neutronium for it.
2016-06-23 22:33:31 +02:00
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Dream-Master
3c2119aaa5 966c948d36 [966c948] 2016-06-22 21:51:31 +02:00
Dream-Master
10a1a2ee47 Adv Mine 2 Texture 2016-06-22 20:30:31 +02:00
Dream-Master
119cb78923 Textures for the Large Fluid Cans 2016-06-22 19:57:01 +02:00
Dream-Master
ada744c29a d718cac331 [d718cac] 2016-06-22 18:52:27 +02:00
Dream-Master
4b3913b175 979a6fb543 [979a6fb] 2016-06-21 22:30:36 +02:00
Dream-Master
e29201f753 new files from gt pull requests 2016-06-21 21:36:03 +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
Muramasa
7e52fb2805 Bug fixes for my commits
Removed commented out old turbine texture code
Fixed Diesel Engine "Fuel Value" unit to EU/L
Fixed mistake with Diesel Engine tooltip. Now asks for Gear boxes.
Forgot to add recipe for Engine Intake.
Redone the Gas/HPSteam turbine recipes.
Fixed Oxygen/Lube being consumed if there is diesel in the hatch, but
not enough for the engine to run
Updated Engine GUI
2016-06-21 00:17:21 +01:00
Muramasa
8e25705a3d Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator 2016-06-19 23:46:40 +01:00
Dream-Master
76fcaebb23 New Gui Textures Thanks to @Muramas 2016-05-25 22:17:16 +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
240d346883 Fixes #367 by adding missing buttons to guis 2016-05-24 21:59:42 +01:00
Dream-Master
9f8de14a9f Change Fuel and Nitro diesel values
change Burn value of Lignite coal 4x
Change Gui Pic from Distillation Tower and Large Heat Exchanger (thanks to Draknyte1)
2016-05-22 02:15:51 +02:00
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01: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
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01:00
Technus
966c948d36 Added files via upload 2016-04-19 19:55:28 +02:00
Technus
9b55e2700b Delete TecCape.png 2016-04-19 19:54:51 +02:00
Technus
cb2b3cc679 Added files via upload 2016-04-18 19:00:33 +02:00
Muramasa
79444adc76 Revert "Turbine Rebalance"
This reverts commit ddc0c4299e.
2016-04-17 07:41:35 +01:00
Muramasa
ddc0c4299e Turbine Rebalance
Added 3 new turbine casings to rebalance the turbines. Also changed
turbine controller recipes to fit the rebalance.

Large Steam: Steel Turbine Casing
Large HP Steam Turbine: Stainless Steel Turbine Casing
Large Gas Turbine: Steel Turbine Casing
Large Diesel Turbine: Titanium Turbine Casing
Large Plasma Turbine: Tungstensteel Turbine Casing
2016-04-17 07:40:10 +01:00
Draknyte1
26e60b7020 Changed a few things to make the Soft Hammer more noticeable from the Hard Hammer.
Now it's a soft Mallet with an inverted icon, as requested by @DarknessShadow - https://github.com/Blood-Asp/GT5-Unofficial/issues/407

# Conflicts:
#	src/main/java/gregtech/api/enums/OrePrefixes.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
#	src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
2016-04-10 18:36:52 +10: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
Dream-Master
54bdb20c50 Change two textures for the New Cans 2016-04-03 13:50:42 +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
Blood-Asp
f4b8aa6f3a Add Fluid Filter and Regulator covers 2016-03-19 20:51:20 +01:00
Teteros
7c3fdb2ebc Synchronize with Blood-Asps' repository 2016-02-29 03:55:05 +00: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
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
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
1464b07b36 Merge pull request #376 from miuirussia/patch-1
More beautiful achievements display
2015-12-25 16:15:30 +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
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
0c9361193a GT Bee fix + new crop textures. 2015-11-18 01:32:45 +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
Blood-Asp
571a8abbe0 Added new crop drops and processing recipes. 2015-11-01 02:47:32 +01:00
Blood-Asp
621573fe84 Fix sulfuric gas texture 2015-10-25 17:24:05 +01:00
Blood-Asp
b8c7137b7d Update Crop Textures 2015-10-24 15:26:26 +02:00
Blood-Asp
f34e8a8d37 missing textures
The resources were missing all experimental textures.
2015-10-24 15:07:23 +02: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
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