Commit graph

772 commits

Author SHA1 Message Date
KpoxaPy
4aa8fd45c4 Add advanced seismic prospector 2017-01-05 02:45:01 +03:00
Blood-Asp
b794aac1d0 Merge pull request #827 from KpoxaPy/unstable
Fix #825
2017-01-04 16:42:25 +01:00
Blood-Asp
868fe1f77d Merge pull request #833 from codewarrior0/patch-1
Fix #830 - Maint Cover does not emit if rotor needs maint
2017-01-04 16:36:04 +01:00
Blood-Asp
b7d187cc4e Merge pull request #836 from codewarrior0/issue-720-cme
Fix #720 - Concurrency error in GT_LanguageManager.addStringLocalization
2017-01-04 16:35:52 +01:00
Andrew Ozmitel
e7e48ff215 Merge remote-tracking branch 'upstream/unstable' into unstable 2017-01-04 15:16:31 +03:00
David Vierra
50b9fc9238 Fix #720 - Concurrency error in GT_LanguageManager.addStringLocalization 2017-01-01 21:57:31 -10:00
Muramasa-
7a8067868d Add missing NEI GUIs & IC2 machine recipe config 2016-12-31 10:17:55 +00:00
David Vierra
75acc1d3eb Fix #830 - Maint Cover does not emit if rotor needs maint
Also change the condition back to 20% durability or less
2016-12-30 23:57:40 -10:00
Andrew Ozmitel
674a2aec83 Fix Blood-Asp/GT5-Unofficial#825 2016-12-28 20:03:05 +03:00
Muramasa-
c69a768640 Fix missing Computronics components 2016-12-27 22:42:02 +00:00
Muramasa-
7e3d4ccf4a Port LightningRod (To be changed by Bloody) & Character fix 2016-12-27 21:08:16 +00:00
Muramasa-
58e2886012 Fix ToolHead processors 2016-12-27 20:49:28 +00:00
Blood-Asp
94cdcfe33c Fix fluid naquadah generator not consuming fuel 2016-12-27 12:14:40 +01:00
Blood-Asp
0c56122e35 Fix Chlorine recipes 2016-12-27 10:41:49 +01:00
Blood-Asp
08c9e3986c Fix pollution effect coordinate calculation 2016-12-24 15:57:34 +01:00
Blood-Asp
e1c60d8bad EBF Efficiency improvements with hier tier coils
Every 1800K free heating capacity the EBF can be overclocked one tier
without efficency loss(4xEU/t, 1/4process time).
Every 900K free heating capacity EU/t is lowered by 5%.
2016-12-24 11:18:14 +01:00
Blood-Asp
2d35f8c0bc Adding missing GT++ metaitems 2016-12-24 00:44:13 +01:00
Blood-Asp
4e1c4b241d Fix broken Hydric Sulfide recipe 2016-12-24 00:41:24 +01:00
Blood-Asp
f2729f281b Rebalanced Rocket Fuel production cost 2016-12-24 00:15:31 +01:00
Blood-Asp
a13374f6ca Correct Chlorine and Hydric Sulfide fluid states 2016-12-24 00:02:16 +01:00
Blood-Asp
823a1fccd2 Play plunger sound when clearing fluids from GT machines 2016-12-23 23:51:47 +01:00
Blood-Asp
c250d93fe5 Reduce damage sense takes when harvesting ic2 crops compared to other uses 2016-12-23 23:51:02 +01:00
Blood-Asp
8e8843b3c9 Enable heat bonus for Naquadah fuel rods 2016-12-23 18:39:42 +01:00
Blood-Asp
60328e2adf Fix oil only be found on second scan 2016-12-23 18:01:36 +01:00
Blood-Asp
77b25d8c82 Add new usages for Graphite 2016-12-23 17:57:58 +01:00
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