Commit graph

300 commits

Author SHA1 Message Date
OneEyeMaker
ea5305f7df Restored broken compatibility. 2016-07-18 14:56:21 +03:00
OneEyeMaker
2b9d87f293 Naquadah should be more expensive. 2016-07-18 10:16:55 +03:00
OneEyeMaker
8bf5b61dea Moved all coils to another block. 2016-07-18 10:05:44 +03:00
OneEyeMaker
ce1e6917e0 Preparations for moving all heating coils to another block. 2016-07-18 09:06:26 +03:00
OneEyeMaker
effe6699f5 Now Naquadria (source of Neutronium) requires highest tier of heating coils. 2016-07-17 17:29:18 +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
32a4f8be83 Added LuV, ZPM and UV Mob Rep
Changed ids from Fluid regulators because overlays ids.
2016-07-05 19:20:20 +02:00
Dream-Master
bdff360684 Change cable to be using rubber instead of wool.
Added 16X Insulated cables
2016-07-04 22:14:50 +02:00
Dream-Master
3ce817dddb More Pollution work 2016-07-04 18:41:53 +02:00
Dream-Master
a22dc1f3e4 Pollution base work (Blood Asp) 2016-07-04 18:37:34 +02:00
Dream-Master
5b626efd74 Rised generator internal EU storage to counter production bug (Blood Asp) 2016-07-04 17:50:19 +02:00
Blood-Asp
704d534b43 More Pollution work 2016-07-03 18:35:51 +02:00
Blood-Asp
57deb3b3e1 Pollution basework 2016-07-03 18:31:06 +02:00
Blood-Asp
f027492fb2 Rised generator internal EU storage to counter production bug 2016-07-03 11:55:45 +02:00
Dream-Master
599095c7dc fix ic2 crash (Blood Asp) 2016-07-02 12:45:52 +02:00
Blood-Asp
d328f7bc88 Fix IC2 glass crash 2016-07-02 12:40:30 +02:00
Dream-Master
f39e81fc90 change Electric Tiers 2016-07-02 12:14:21 +02:00
Dream-Master
df720f7ace Adding Blood Infused Iron to GT
More recipe changes (Blood Asp)
2016-07-02 11:31:02 +02:00
Blood-Asp
c320af9f3e Even more changes 2016-07-01 22:23:04 +02:00
Muramasa
1b162ae25e Changed wire/rotor components 2016-07-01 15:41:08 +01:00
Muramasa
63f64cb514 Initial 2016-07-01 13:15:55 +01:00
Dream-Master
6daf342c2f fix 2016-06-30 21:47:08 +02:00
Dream-Master
857fb7ec02 Assembly Line recipe work (Blood Asp) 2016-06-30 21:24:13 +02:00
Blood-Asp
90d776893e More Assembly Line recipe work 2016-06-30 00:12:00 +02:00
Blood-Asp
b9ee95c797 AL Recipe work 2016-06-27 23:49:18 +02:00
Dream-Master
5de110ad42 This works
HeeEndium
2016-06-26 23:43:15 +02:00
Dream-Master
4046c52835 Change Material HEE Endium 2016-06-26 23:30:14 +02:00
Dream-Master
c612ec5d0d fixing materials 2016-06-25 12:48:19 +02:00
Dream-Master
fe93065662 Adding Manyullyn to materials 2016-06-24 23:50:15 +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
Blood-Asp
11721a7765 Changed Field Generator recipes 2016-06-23 01:02:58 +02:00
Dream-Master
0152aba652 Neutronium Blast Furnace only 2016-06-23 00:10:51 +02:00
Dream-Master
f36e838f31 e806860390 [e806860] 2016-06-22 22:10:13 +02:00
Dream-Master
9c2acd772d neutronium 2016-06-22 21:59:49 +02:00
Dream-Master
64c0c1ca9d c68814f780 [c68814f] 2016-06-22 21:24:15 +02:00
Dream-Master
481d3c1a29 2b96b3ce9c [2b96b3c] 2016-06-22 21:14:20 +02:00
Dream-Master
7cf4b14004 3af174488a [3af1744] 2016-06-22 21:12:55 +02:00
Dream-Master
867104b900 851995fb6e [851995f] 2016-06-22 20:51:49 +02:00
Dream-Master
ad665de09d 3cf92b0a59 [3cf92b0] 2016-06-22 20:47:28 +02:00
Dream-Master
39073d7fbc 2d54d34aef [2d54d34] 2016-06-22 20:36:51 +02:00
Dream-Master
7f0ce6117c New Large Fluid Cells 2016-06-22 19:54:59 +02:00
Dream-Master
a323ec71e4 dc6314f396 [dc6314f] 2016-06-22 19:43:55 +02:00
Dream-Master
785ac4edb9 b61c25be00 [b61c25b] 2016-06-22 19:41:17 +02:00
Dream-Master
5b546fc964 7218ee8e9e [7218ee8] 2016-06-22 19:36:16 +02:00
Dream-Master
9e074b8a4f 04b5d32fe0 [04b5d32] 2016-06-22 18:57:45 +02:00
Dream-Master
ada744c29a d718cac331 [d718cac] 2016-06-22 18:52:27 +02:00
Dream-Master
2c51d0d12e 1f4f33837d [1f4f338] 2016-06-22 17:12:42 +02:00
Dream-Master
cd0f2a498f d9afccdf22 [d9afccd] 2016-06-22 00:55:40 +02:00
Dream-Master
3917d26760 91d34c2c68 [91d34c2] 2016-06-22 00:05:04 +02:00
Dream-Master
c00f0f9fc6 ae4ec23ece [ae4ec23] 2016-06-21 23:32:33 +02:00
Dream-Master
fb484850c9 f11e8300f2 [f11e830] 2016-06-21 23:30:12 +02:00
Dream-Master
a60dbf2302 ea644f2168 [ea644f2] 2016-06-21 23:25:35 +02:00
Dream-Master
10e42abcc0 438d5f39d3 [438d5f3] 2016-06-21 23:17:11 +02:00
Dream-Master
55e302f58d 694a087c75 [694a087] 2016-06-21 23:02:05 +02:00
Dream-Master
bbfad579ae 732172cce8 [732172c] 2016-06-21 22:42:08 +02:00
Dream-Master
5579f21eb3 e4859f2a1f [e4859f2] 2016-06-21 22:36:40 +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
Blood-Asp
7a9c3857e2 Merge pull request #526 from perkinslr/experimental
Make processing array handle multiple input stacks at a time
2016-06-21 19:56:34 +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
Blood-Asp
d61667d436 Improved Ultimet stats 2016-06-20 00:39:42 +02:00
Blood-Asp
91fc3a20cd Implement IBoxable for radioactive componentes 2016-06-19 20:49:52 +02:00
Blood-Asp
e340d17337 Improved Neutronium for being highest tier material 2016-06-19 19:55:22 +02:00
Blood-Asp
537d6e9330 changed plasma turbine damage and added config 2016-06-19 19:43:14 +02:00
Blood-Asp
96607760e1 EnderIO Wrench Support 2016-06-19 18:23:28 +02:00
Blood-Asp
183a681d52 IC2 Single-Use battery support 2016-06-19 17:36:54 +02:00
Blood-Asp
3a249d8075 Merge pull request #500 from Muramasa-/DieselGenerator
Large Diesel Generator
2016-06-19 17:12:23 +02:00
Logan Perkins
54ae577be0 Make recipe input work for split stacks 2016-06-12 10:41:52 -07:00
Muramasa
237e5e682d Possibly final commit 2016-06-01 06:34:33 +01:00
Dream-Master
9af2049318 Adding Assembly Line (no Assembler Casing recipe yet) 2016-05-25 23:34:55 +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
bbcc38e930 More fixes for #507 2016-05-25 19:16:41 +01:00
Muramasa
2cad97e975 Fixes #507 2016-05-24 22:02:46 +01:00
Muramasa
0fadfa2543 Fixes #501 2016-05-24 21:37:46 +01:00
Muramasa
960087a0a8 Cleanup + Improvement 2016-05-23 18:15:21 +01:00
Dream-Master
e806860390 Ethanol fix 2016-05-22 20:09:31 +02: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
Dream-Master
48dac29710 Thaumcraft Aspect fix 2016-05-22 01:47:08 +02:00
Muramasa
4fdbf01fae My client likes to uncheck files 2016-05-20 05:37:43 +01:00
Muramasa
8880eb8d6d Basically a rewrite 2016-05-20 05:36:32 +01:00
Dream-Master
7e4aecb65f Change Neutronium Material and add Droconium EFB recipes. 2016-04-30 20:04:07 +02:00
Muramasa
4a59d0efbd Implemented Output Calculation 2016-04-29 07:31:58 +01:00
MauveCloud
b69385d29b Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental 2016-04-28 11:30:29 -07:00
MauveCloud
9036858017 Improved output bus handling 2016-04-27 17:31:20 -07:00
Muramasa
97eb99bd5d Main Commit for Large Diesel Generator 2016-04-28 00:58:55 +01:00
Blood-Asp
5c8eec846d Merge pull request #493 from Muramasa-/TurbineCasingRebalance
Turbine casing rebalance
2016-04-27 21:18:29 +02:00
MauveCloud
784c65a884 Added Crop Calculator support. 2016-04-26 13:30:26 -07:00
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
Technus
c68814f780 Adding Multismelter paraller count info to scanner,
Adding EBF Heat Capacity to scanner,
 reformatting rest of scanner msgs to be unified
2016-04-17 13:08:19 +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
Dream-Master
2b96b3ce9c Draconium needs now new Coils 2016-04-16 22:07:33 +02:00
Technus
3a83a35433 Visualy paintable un-insulated wires 2016-04-16 16:25:45 +02:00
Blood-Asp
c98736b7b3 Adding assembly line recipe check 2016-04-11 23:14:57 +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
Technus
7a047d977a Update GT_Utility.java 2016-04-10 12:09:28 +02: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
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
Blood-Asp
af20a2e4ab Show all ingot fluid extractions and all iron/copper arc furnace recipes 2016-03-27 17:50:10 +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
Blood-Asp
b2ac24e85a Tooltip fix 2016-03-20 17:08:33 +01:00
Blood-Asp
009c032c13 Hiding of Recycling recipes and unneeded ores in NEI 2016-03-20 16:47:17 +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
e8f0482b16 Dynamite impcomp and fluid mox fixes 2016-03-18 22:43:22 +01:00
Blood-Asp
a80e44f7f5 Added sharpness enchantment for HSS material tools 2016-03-17 00:49:47 +01:00
Blood-Asp
0a6e69e254 Rised crop root length to match IC2 again 2016-03-16 23:52:52 +01:00
Blood-Asp
9e7f34a12f Fix heavy oil gen without messing everything up 2016-03-16 22:49:15 +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
a475c87f17 Fixed heavy oil not generated 2016-01-30 14:39:08 +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
4537392c10 Reserving Meta IDs 2016-01-10 14:18:16 +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
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
cf69a7f392 Explosives rework 2016-01-03 02:16:02 +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
Blood-Asp
9362235140 fix mox output not rising with heat 2015-12-29 14:42:13 +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
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