Commit graph

847 commits

Author SHA1 Message Date
Blood-Asp
82b97af85e Naquadah gen mk3 now uses cells with molten naquadah instead of dust 2016-12-23 14:27:42 +01:00
Blood-Asp
ba8b780c9e Magic super fuel recipes that do not need thaumcraft 2016-12-23 13:55:00 +01:00
Blood-Asp
46c145c06b Fix efficiency in scan data of Diesel Engine 2016-12-19 14:27:29 +01:00
Blood-Asp
6e3e6494a1 Merge pull request #803 from dgabehar/unstable
Crash with Modular Exoskeleton #769
2016-12-17 18:21:51 +01:00
Blood-Asp
c9eb3dc3b4 Rise Hot coolant -> heat conversion ration in IC2 heat exchanger by 20% to avoid rounding bug 2016-12-17 18:20:59 +01:00
Blood-Asp
f3f90f699b Fix Food Can recipes 2016-12-17 18:16:37 +01:00
Blood-Asp
1aa9ce6501 Fix LuV+ disassemblers 2016-12-17 18:10:38 +01:00
Blood-Asp
f0ff2a6cfc Void wrong type of steam inserted into steam turbines.
Prevents getting stuck on superheated/normal steam change.
2016-12-16 18:34:26 +01:00
Blood-Asp
cca28f29fa Add mable and basalt ores to ore typefilter 2016-12-16 17:54:43 +01:00
Blood-Asp
650ec1a800 Fix ULV and LV wire/cable recipes 2016-12-16 17:23:39 +01:00
Doug Gabehart
3d2dd065fa Added check to ensure that fluid is set trying to provide air to player during onArmorTick
Looking at how to fill helmet tank from air cell
2016-12-15 17:11:13 -06:00
Doug Gabehart
b41c3370cc Fixed processing power issue where values continually increased up to infinity 2016-12-15 09:10:45 -06:00
Doug Gabehart
6364378437 More stability improvements. (Null value and checks to ensure keys exist) 2016-12-14 20:35:43 -06:00
Doug Gabehart
6ceff6d783 Fixed issue with Modular Armor inventory not saving properly after removing the call to closeScreen
Added null and key checks when determining if a full radiation or electrical armor set is configured
2016-12-14 16:04:20 -06:00
David Vierra
7d1e42f75c Don't allow Large Turbine to start up without Dynamo Hatch
Large Turbine was incomplete if the Dynamo Hatch spot was taken up by a different GTTE, but not if that spot was just Air or some other block.
2016-12-14 20:06:31 +01:00
Doug Gabehart
b9ebe16655 Removed player.closeScreen call to fix graphics glitch when switching armor tabs 2016-12-14 11:34:00 -06:00
Doug Gabehart
df00993c0d Added updateArmorStats method which includes additional checks to ensure that values are not null and the key in question exists in mStats
Removed player.closeScreen call in mouseClicked to prevent display glitch when switching armor gui tabs; (mouse focus from returning to 2x2 crafting grid)
2016-12-14 11:12:07 -06:00
Dimach
d51f43f97b Ore harvest level rework. Fixed #730. 2016-12-13 20:20:36 +01:00
Blood-Asp
1efd486dbb Disable markDirty function of TileEntitys
http://forum.industrial-craft.net/index.php?page=Thread&postID=205162#post205162
2016-12-13 20:10:30 +01:00
Blood-Asp
f86fce4cf3 Fix mining laser recipe 2016-12-13 20:08:23 +01:00
David Vierra
3b5dfb6f7b Fix #785 - Unlimited EU in Dynamo Hatch
I went with @Techlone's simple solution after all.

Counting out the individual EU might make more sense if any of the multiblocks could have more than one dynamo hatch, but they don't, so this is just fine.
2016-12-13 19:24:31 +01:00
Blood-Asp
8e31958980 Merge pull request #777 from Dimach/unstable
Fixed #767
2016-12-13 19:17:47 +01:00
Blood-Asp
423b3ad8ef Merge pull request #798 from Techlone/unstable
Fix optimal plasma flow tooltip
2016-12-13 19:16:21 +01:00
David Vierra
0cd2371e3b Change Oil Cracker tooltip to match reality (and vice versa)
Oil Cracker only allows Maint/Energy hatches in the middle ring. Input and output hatches can be anywhere on the sides.

Minimum casing count is changed to 18 to match the tooltip, rather than increase the tooltip to 19. This allows two input and output hatches on either side, for when you want to run two cracking recipes with the same cracker.

(It turns out the cracker doesn't care which hatch the inputs and hydro/steam are put into. I don't really care either!)
2016-12-13 19:15:08 +01:00
David Vierra
dcf348a7e1 Fix efficiency penalty incorrectly applied to large gas+plasma turbines
This is a copy-paste error from the original code in the large steam
turbine. `aOptFlow` is the optimal flow rate expressed in EU/t, while
`totalFlow` is expressed in fuel L/t
2016-12-13 19:15:08 +01:00
David Vierra
f98ce7ef08 Fix #771 - 9x output on boosted Diesel
Remove an extra efficiency multiplier. `mEfficiency * mEUt` is already done in `GT_MetaTileEntity_MultiBlockBase.onRunningTick`
2016-12-13 19:15:07 +01:00
David Vierra
d699de59ba Adjust Diesel Engine tooltip to match requirements
16 Casings are required along the corners and edges. The Hatches may not be along a corner or edge, but may only be placed on the sides, next to a Gear Box.

Also note Diesel, Lube, and Oxygen use.
2016-12-13 19:15:07 +01:00
David Vierra
d519d7f00b Replace all literal numbers referring to tool types with named constants 2016-12-13 19:15:07 +01:00
Archengius
56487abe99 Merge pull request #801 from danbka33/progress
Hide bar #799
2016-12-13 23:15:53 +07:00
Данила Большаков
8ea9df2e7b Hide bar 2016-12-13 13:53:37 +03:00
Archengius
3457b52964 Merge pull request #799 from danbka33/progress
Add progress bar for materials registration
2016-12-13 17:38:59 +07:00
Danila Bolshakov
60704cca7f forgot check null 2016-12-13 11:50:01 +03:00
Danila Bolshakov
920ba2f0c3 Add progress bar 2016-12-13 11:41:38 +03:00
Techlone
75fc96694a fix optimal plasma flow tooltip 2016-12-12 22:59:04 +05:00
Archengius
248b88e8bc Merge pull request #797 from Dimach/fluidregulator-fix
Fixed #796.
2016-12-12 01:22:59 +07:00
Dimach
be37504009 Fixed #796. 2016-12-11 19:56:06 +02:00
Blood-Asp
34481d0c85 Merge pull request #788 from Dimach/unstable-upstream
Fixed #786.
2016-12-07 22:07:49 +01:00
Blood-Asp
0c4e3cbd09 Merge pull request #782 from codewarrior0/advminer-fix
Fix Advanced Miner II occasionally outputting the wrong blocks
2016-12-07 22:06:17 +01:00
Dimach
151fc26133 Fixed #786. 2016-12-07 11:48:33 +02:00
David Vierra
4176f2c525 Fix Advanced Miner II occasionally outputting the wrong blocks
AdvMinerII would occasionally output the drops from a block recently
broken by the player. This happens when the wrong coordinates are
passed to GT_Block_Ores_Abstract.getDrops(), which causes it to fail to
find the TileEntity and then fall back to whatever the most recently
broken block was.

Fixes #751 (probably), #674, #508
2016-12-04 15:22:03 -10:00
Dimach
b1c2cbe935 Fixed #767. 2016-11-28 22:05:42 +02:00
Timeslice42
7df5add5a9 Re-add single-use batteries
How did this get removed? ><
2016-11-05 22:11:36 +01:00
Blood-Asp
58206f909e Merge pull request #727 from Dimach/unstable
Fixed oil rig
2016-11-04 22:13:45 +01:00
Dimach
bc619efb8a Fixed oil rig. 2016-11-04 21:30:57 +02:00
Blood-Asp
2108b9cdc8 Assemblyline recipe scan fix and TC quicksilver/mercury recipes 2016-11-04 00:05:15 +01:00
Blood-Asp
7d1b8f8480 update build script 2016-11-03 12:19:59 +01:00
Blood-Asp
c552f67120 Fix Large turbine tooltips 2016-11-02 23:16:23 +01:00
Blood-Asp
8a17c67442 Turn off AdvMinerII and OilDrill once work is done. 2016-11-02 23:14:40 +01:00
Blood-Asp
481580b723 Fix broken crop oreprocessing 2016-11-02 22:55:13 +01:00
Blood-Asp
395888a884 Modular Armor configs 2016-11-02 22:14:18 +01:00