Commit graph

1746 commits

Author SHA1 Message Date
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
Данила Большаков
8ea9df2e7b Hide bar 2016-12-13 13:53:37 +03: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
David Vierra
3787b0399b 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-12 17:09:02 +01:00
David Vierra
eb45538f03 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-12 17:05:35 +01:00
Technus
60a9a2c09e Not needed serverside, 2016-12-12 17:04:54 +01:00
Technus
6d291877d2 EM container. 2016-12-11 20:25:14 +01: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
Technus
85bcc9e49e Commit Stuff 2016-12-11 17:24:01 +01:00
Technus
6225926757 Add item 2016-12-11 16:16:41 +01:00
Technus
302d4fec7f Fix recipes. 2016-12-10 20:56:07 +01:00
Technus
fa98d04d13 Tweak fusion more 2016-12-10 10:05:10 +01:00
Technus
da8d547cfd Tweak Fusion 2016-12-10 09:49:46 +01:00
David Vierra
c8655c6d49 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-08 22:06:38 +01:00
David Vierra
06636fd149 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-08 22:05:59 +01:00
David Vierra
c0f6a4e77a Fix boosted diesel x9 on things. 2016-12-08 22:05:28 +01:00
David Vierra
6c00cc8849 Diesel Tooltip from bloodasp 2016-12-08 22:00:07 +01:00
Technus
037953a47f Fix emmiter and sensor recipe 2016-12-08 21:47:07 +01:00
Blood-Asp
34481d0c85 Merge pull request #788 from Dimach/unstable-upstream
Fixed #786.
2016-12-07 22:07:49 +01:00
Dimach
151fc26133 Fixed #786. 2016-12-07 11:48:33 +02:00
Technus
ad6de73748 Remove some more cells 2016-12-06 12:39:59 +01:00
Technus
5611cc7404 Remove Nq+ cells use stick longs instead - also made the last 2 naq reactors more tiered. (the uv needed less processing for fuel...), also cleanum whitespace 2016-12-06 12:27:17 +01:00
Technus
a232fbd842 Remove cell registration. 2016-12-06 12:10:26 +01:00
Technus
badccece12 Fix recipes in mixer (ffs y u no work for HSS-S) 2016-12-06 11:56:22 +01:00
Technus
06b9f0123f Revert "Fix HSS-S mixer recipe."
This reverts commit 8080379bd6.
2016-12-05 12:51:17 +01:00
Technus
8080379bd6 Fix HSS-S mixer recipe. 2016-12-05 12:49:05 +01: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
Technus
9e366cab6b Fixes texture outside Dev Env 2016-12-04 15:20:31 +01:00
Technus
b9db0844dc Laser engraver recipe fix. 2016-12-02 12:30:03 +01:00
Technus
f127d61767 Fix shit 2016-12-01 18:41:01 +01:00
Technus
0291dbd90b May or may not fix wire burning again. 2016-12-01 14:18:04 +01:00
Technus
e5e9ef76eb DERP 2016-11-30 22:49:12 +01:00
Technus
440adbdff3 Fix tinny pipe/wire renderer and add reverse recipes for coils. 2016-11-30 19:20:57 +01:00
Technus
524c49eb75 Nerf just in case 2016-11-30 12:13:17 +01:00
Technus
522cb43434 Also rename material 2016-11-30 12:06:27 +01:00
Technus
22ad077180 WHITESPACE 2016-11-30 11:43:14 +01:00