Commit graph

357 commits

Author SHA1 Message Date
Muramasa
6c2c76bd06 Require Titanium Pipe Casing 2016-04-28 02:31:00 +01:00
Muramasa
a62b061968 More Fixes
TODO:
Require Dynamo back centered (Currently anywhere)
Require Muffler top centered (Currently anywhere)
Implement output calculation
Implement coolant requirement (Water or IC2Coolant?)
Possible add different tiers of diesel generator?
2016-04-28 02:16:11 +01:00
Muramasa
76902f45f7 More Cleanup and finalizing 2016-04-28 01:52:46 +01:00
Muramasa
97eb99bd5d Main Commit for Large Diesel Generator 2016-04-28 00:58:55 +01:00
Muramasa
d713c5ddec Remove Diesel Turbine 2016-04-19 23:19:59 +01:00
Muramasa
12a1d1c46e Main Commit 2016-04-19 23:17:31 +01:00
Technus
6d95adb9fd Update GT_MetaGenerated_Item_01.java 2016-04-19 18:43:16 +02:00
Technus
59503f56af Update GT_MetaGenerated_Item_01.java 2016-04-19 18:12:35 +02:00
Technus
94b7324b5a Changed Motor recipes. 2016-04-19 17:59:59 +02:00
Technus
324b1b56e7 Adding GT:NH Capes 2016-04-18 16:25:35 +02:00
Technus
bf62bffefb Adding GT:NH Capes 2016-04-18 13:28:36 +02:00
Dream-Master
0a5ea5afae fix #565
Change Motors to have max 4 cable instead of 16
2016-04-17 22:37:37 +02: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
Muramasa
063b62b4ca Fixed newMetaEntity using Plasma Generator 2016-04-17 03:05:58 +01:00
Muramasa
31e4330b69 Large Diesel Generator
Added large diesel generator to the game. It replicates the Large Plasma
Generator but it's nominal output is 1/8 that plasmas is.

Plasma Nominal: Optimal Steam Flow * 40
Diesel Nominal: Optimal Steam Flow * 5
2016-04-17 01:41:06 +01:00
Technus
4c76b14530 Merge pull request #7 from GTNewHorizons/MultiSmelter-Rebalance
Less power consumption for SUPERCONDUCTORs
2016-04-16 23:20:38 +02:00
Technus
1412d578cb Less power consumption for SUPERCONDUCTORs
Will use max 2input hatches
2016-04-16 22:30:33 +02:00
Technus
767112b88c Update GT_MetaTileEntity_ElectricBlastFurnace.java 2016-04-16 21:58:46 +02:00
Dream-Master
e06633f19f fix 2016-04-16 21:56:49 +02:00
Martin
6596f51a0d Merge pull request #5 from GTNewHorizons/MultiSmelter-Rebalance
Rebalance MultiSmelter to match proc. arrays
2016-04-16 21:47:03 +02:00
Technus
76c555d62c Update GT_Item_Casings_Abstract.java 2016-04-16 20:10:23 +02:00
Technus
a2d27ad80e Update GT_Item_Casings1.java 2016-04-16 20:07:04 +02:00
Technus
7444ea7860 Initial commit
Adding superconductor coil block support with base temperature 9000.
2016-04-16 20:01:01 +02:00
Technus
61e5c04554 Update GT_MetaTileEntity_MultiFurnace.java 2016-04-16 19:45:48 +02:00
Technus
61c97b1e50 Update GT_MetaTileEntity_MultiFurnace.java 2016-04-16 19:39:50 +02:00
Technus
ebb6c613bf Rebalance MultiSmelter to match proc. arrays
added tier 4 coils for whole stack smelting
2016-04-16 19:26:03 +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
83344732eb Cleanup 2016-04-11 21:50:01 +02:00
Blood-Asp
3aae928510 Added Assembly Line Multiblock 2016-04-11 21:47:53 +02:00
Draknyte1
36a97e706b Submitting PR's is a pain.
Always use most up to date files for the repo you're contributing to. #NotGT5.8Files
2016-04-11 20:47:30 +10:00
Alkalus
ba1f0f99ab Update GT_MetaGenerated_Tool_01.java
left a : not a ;
2016-04-10 19:29: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
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
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
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
46320af060 Tool Tips
Adding Draconium to GT
2016-04-01 20:52:48 +02:00
Blood-Asp
b71fa8f042 advminer2 2016-03-28 03:36:09 +02:00
Blood-Asp
b8579b2ee3 small fixes to distillation tower and advMiner2 2016-03-28 03:35:21 +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
80d362ceb8 Stop disassembler destroying not electric GT tools 2016-03-27 16:54:11 +02:00
Blood-Asp
44f3e89bdf Rebalance oil processing and improve pipe covering 2016-03-27 16:43:03 +02:00
Blood-Asp
e56a98af45 Update Charcoal pit tooltip 2016-03-27 15:26:36 +02:00
Blood-Asp
6e0f90964e Fix regulator crafting recipes 2016-03-20 23:34:09 +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
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
Blood-Asp
ac258896de remove console print 2016-03-20 14:59:07 +01:00
Blood-Asp
529c28649a Fix item detector not working correctly 2016-03-20 14:57:51 +01:00
Blood-Asp
c7c8ba7020 More work on tool hardening 2016-03-20 01:23:03 +01:00
Blood-Asp
20cd83a175 Allow shift rightclick for screwdrivers 2016-03-19 22:15:50 +01:00
Blood-Asp
f4b8aa6f3a Add Fluid Filter and Regulator covers 2016-03-19 20:51:20 +01:00
Blood-Asp
b4eb7f494f Advanced Miner II fixes 2016-03-18 23:29:24 +01:00
Blood-Asp
e8f0482b16 Dynamite impcomp and fluid mox fixes 2016-03-18 22:43:22 +01:00
Blood-Asp
df28bd66ec HP Turbine deletes normal steam in input hatch to not get stuck 2016-03-18 22:22:27 +01:00
Blood-Asp
a8f91902d1 Improved Sense 2016-03-17 23:35:10 +01:00
Blood-Asp
cd61ff3ae1 Made Large fluid cells stack more and cheaper to build 2016-03-17 00:53:28 +01:00
Blood-Asp
be8d29da74 Fixed turbine output falling when supplying more than opt flow 2016-03-17 00:41:15 +01:00
Blood-Asp
7ac0849c1a Added NC display support for large turbines 2016-03-17 00:28:09 +01:00
Blood-Asp
3e39b7c233 Fix large boiler tooltip 2016-03-16 23:54:23 +01:00
Techlone
fa3e5c0a44 Fix boost of starting of fusion reactors 2016-03-15 13:41:02 +05:00
MIUI Russia
1e747853c4 Fixed load textures 2016-03-01 23:07:54 +03: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
abc6cfc291 recipe Change for Drain and the Shutter Module #438 2016-01-05 21:28:08 +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
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
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
a4bf359b03 Initial Modular armor port (from GTExtras) 2015-12-25 16:14:52 +01:00
Blood-Asp
1e13709399 fuel rod override v2 2015-12-25 15:09:22 +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
Blood-Asp
a448be8d4a increase hot coolant energy output 4x 2015-12-21 22:08:13 +01:00
Blood-Asp
a9aac6ff58 comb processing fixes 2015-12-21 19:44:23 +01:00
Blood-Asp
2baf34b03a Fixed AdvMiner II running without drilling fluid 2015-12-21 16:39:11 +01:00
LemADEC
63f8506fd6 Fixed world event lag and related cauldron crash 2015-12-19 21:09:16 +01:00
Dream-Master
26c684ce02 remove this from Gt Code 2015-12-17 13:10:19 +01:00
Blood-Asp
8f3c48ed11 fix teleporter and improve seismic prospector 2015-12-13 18:07:59 +01:00
Blood-Asp
55aa306e67 Fix teleporter nuclear control support 2015-12-13 17:45:57 +01:00
Blood-Asp
8659c9573c fixed end asteroids spawning with red granite texture 2015-12-13 17:24:34 +01:00
Blood-Asp
70e652420d change crop drop processing like bee comb processing 2015-12-13 16:45:57 +01:00
Blood-Asp
0bdf8a2e40 removed passive energy use of covers, changed size tooltips and changed comb processing 2015-12-13 16:03:22 +01:00
Dream-Master
27ee4e8635 Test commit to put Core Mod Items into GT code. 2015-12-13 11:52:02 +01:00
Blood-Asp
873902f4bf make steam boilers not automateable 2015-12-11 15:25:48 +01:00
Blood-Asp
e0b128e9fa fix iridium reinforced block reprocessing 2015-12-11 14:50:06 +01:00
Blood-Asp
02e556598e fixed ore achievements not working with custom ores 2015-12-10 21:02:37 +01:00
Blood-Asp
6b2e08b2ca shift + screwdriver for all covers 2015-12-10 18:25:07 +01:00
Blood-Asp
a7c9f96647 fix thaumium block overwritten, cable error without RF api and cells getting eaten 2015-12-10 15:04:23 +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
aeb505273b Saving pumped oil amounts in chunk NBTs 2015-12-06 21:15:41 +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
899973b0dc Fixed Quantum chest loosing items. 2015-12-05 00:04:54 +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
4fd0a7f473 Fix forestry compatibility and add luber ability to chainsaw 2015-11-28 20:35:20 +01:00
Blood-Asp
063a758961 Mass fabricator fix and Charcoal pit oredict support. 2015-11-25 02:56:23 +01:00
Blood-Asp
d2e2d83156 fixed mark3 fusion overclock 2015-11-24 03:48:28 +01:00
Blood-Asp
df1ffb0211 fixed battery hull crafting/reprocessing 2015-11-24 03:37: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
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
91d34c2c68 New Nerfed Small Gears and Ring recipes into GT code. 2015-11-20 09:41:17 +01:00
Dream-Master
5d3b9496df Disabled Rotors (no texture) 2015-11-05 22:49:24 +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
Blood-Asp
40324b05f9 Fixed ItemFiler OpenGL error. 2015-11-01 14:09:18 +01:00
Blood-Asp
cc89e15b5b Fix Seismic prospection without ores failing 2015-11-01 13:46:35 +01:00
Blood-Asp
571a8abbe0 Added new crop drops and processing recipes. 2015-11-01 02:47:32 +01:00
Blood-Asp
97afccb0c3 Some TC aspect registering changes 2015-11-01 01:10:52 +01:00
Blood-Asp
29fade51aa Forestry update + bee nerv 2015-10-29 00:37:04 +01:00
Blood-Asp
8d8594dabd GT Wrench now implements Buildcrafts Wrench IToolWrench 2015-10-25 23:56:58 +01:00
Blood-Asp
1e425e6622 Added burn values for caesium 2015-10-25 23:17:39 +01:00
Blood-Asp
0f288afe8b Added config for block harvest levels. 2015-10-25 22:52:57 +01:00
Shawn Buckley
f9ee88cf64 Merge branch 'experimental' of github.com:Blood-Asp/GT5-Unofficial into experimental 2015-10-25 09:32:11 -04:00
Shawn Buckley
40be76a82b Merge branch cover_print_switch 2015-10-25 09:31:12 -04:00
Shawn Buckley
46f4473de6 Change if chains to switches 2015-10-25 09:27:29 -04:00
Blood-Asp
2a08dcc756 fixed unification issue 2015-10-25 14:02:52 +01:00
Blood-Asp
9b91a89e12 fix pyrolyseoven 2015-10-25 13:50:11 +01: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
05316f03ab Update IC2 Nuclear control to 2.3.1a-Butt 2015-10-21 21:31:35 -04:00
Shawn Buckley
cda516a3e3 Update to Forestry 4 2015-10-21 21:30:33 -04:00
Shawn Buckley
c68e84f1e2 Remove jdgui-comments 2015-10-21 21:11:56 -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
Shawn Buckley
ad473b9ac0 Update IC2 Nuclear control to 2.3.1a-Butt 2015-10-20 21:23:33 -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