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

171 commits

Author SHA1 Message Date
Muramasa
cb962573e2 Missed a file 2016-04-19 23:31:41 +01:00
Muramasa
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01: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
Dream-Master
2b96b3ce9c Draconium needs now new Coils 2016-04-16 22:07:33 +02:00
Blood-Asp
22dd09be01 Adding assembly line recipes 2016-04-11 22:30:53 +02:00
Blood-Asp
3aae928510 Added Assembly Line Multiblock 2016-04-11 21:47:53 +02:00
Draknyte1
523d2c449e Should fix any issues. 2016-04-11 20:34:56 +10:00
Draknyte1
1d279c741f Made these up to date with latest experimental commit, as mine were slightly out of date. :) 2016-04-10 19:15:41 +10: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
3cf92b0a59 Add Draconium to tag metal 2016-04-09 17:57:17 +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
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
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
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
Blood-Asp
44f3e89bdf Rebalance oil processing and improve pipe covering 2016-03-27 16:43:03 +02:00
Dream-Master
7218ee8e9e Cobalt need EBF 
Change to lv 5
 2016-03-22 00:20:53 +01:00
Dream-Master
ae58de2708 rotors machine recipes.(Blood Asp) 2016-03-20 13:30:02 +01:00
Blood-Asp
c7c8ba7020 More work on tool hardening 2016-03-20 01:23:03 +01:00
Blood-Asp
f4b8aa6f3a Add Fluid Filter and Regulator covers 2016-03-19 20:51:20 +01:00
Blood-Asp
c1f5c8c354 Added machine recipe for rotors, added silicone soft hammer 2016-03-18 23:05:38 +01:00
Blood-Asp
a80e44f7f5 Added sharpness enchantment for HSS material tools 2016-03-17 00:49: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
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
Dream-Master
1f4f33837d fix Platinum derp #437 2016-01-05 21:00:28 +01:00
Blood-Asp
5fd2db9ef2 spelling fixes and chainsaw + forestry leaves fix 2016-01-03 05:27:51 +01:00
Blood-Asp
cf69a7f392 Explosives rework 2016-01-03 02:16:02 +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
68a19fd70c Overriding IC2 fuel rods 2015-12-25 14:37:56 +01:00
Blood-Asp
a9aac6ff58 comb processing fixes 2015-12-21 19:44:23 +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
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
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
3106bfe8a2 Fix CarbonDioxide, lower outputstacksize by screwdriver + shift and hide blocks without materials 2015-12-04 22:44:27 +01:00
Blood-Asp
c79c21aa00 Rebalanced oil/fuel burn values to fit more complex processing 2015-11-30 02:37:05 +01:00
Dream-Master
ae4ec23ece fix name 2015-11-15 22:42:07 +01:00
Dream-Master
f11e8300f2 some fixes again 2015-11-14 13:40:35 +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
732172cce8 Ardite no EBF recipe 2015-11-03 12:36:39 +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
Blood-Asp
571a8abbe0 Added new crop drops and processing recipes. 2015-11-01 02:47:32 +01:00
Blood-Asp
bc86770624 added config to disable crops 2015-11-01 01:57:09 +01:00
Blood-Asp
29fade51aa Forestry update + bee nerv 2015-10-29 00:37:04 +01: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
Blood-Asp
a2ad9c9e83 fixed naquadah cell reverse processing 2015-10-24 18:41:53 +02:00
Blood-Asp
8f851f0f68 Made Materials human readable again 2015-10-24 17:32:16 +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
445e6c3f25 Replace T/F with builtin boolean values 2015-10-21 22:01:39 -04:00
Shawn Buckley
34ecdfb190 Replace homegrown character comparision for builtin ones 2015-10-21 20:58:55 -04:00
Shawn Buckley
bea4cfc545 Bring in experimental branch 2015-10-21 20:47:13 -04:00
Shawn Buckley
1185424fa7 Move source files 2015-10-21 20:46:52 -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
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