Commit graph

601 commits

Author SHA1 Message Date
Blood-Asp
032ac601b5 Merge pull request #755 from MauveCloud/experimental
Fix for negative-coordinate vein generation, adjustments to recipes for stone dust, sand, and flint
2016-12-12 17:17:18 +01:00
Blood-Asp
7462d5714c Merge branch 'experimental' into experimental 2016-12-12 17:16:43 +01:00
Blood-Asp
c6fab8b6ff Merge pull request #789 from codewarrior0/patch-7
Fix #785 - Unlimited EU in Dynamo Hatch
2016-12-12 16:56:39 +01:00
David Vierra
b2859158aa 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-07 14:21:31 -10:00
MauveCloud
7acde37510 Manually merged changes from #752 2016-12-07 13:25:11 -08:00
Blood-Asp
c0d7d7eefd Merge pull request #784 from codewarrior0/patch-6
Change Oil Cracker tooltip to match reality (and vice versa)
2016-12-07 22:07:27 +01:00
Blood-Asp
41962f4a36 Merge pull request #780 from codewarrior0/turbine-penalty
Fix efficiency penalty incorrectly applied to large gas+plasma turbines
2016-12-07 22:04:23 +01:00
Blood-Asp
0df948887f Merge pull request #779 from codewarrior0/patch-5
Fix #771 - 9x output on boosted Diesel
2016-12-07 22:03:55 +01:00
Blood-Asp
6c38c5cecc Merge pull request #774 from codewarrior0/patch-4
Adjust Diesel Engine tooltip to match requirements
2016-12-07 21:55:34 +01:00
Blood-Asp
666b9cba02 Merge pull request #752 from codewarrior0/tool-enums
Replace all literal numbers referring to tool types with named constants
2016-12-07 21:49:57 +01:00
David Vierra
9f6a7bb026 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-05 18:29:56 -10:00
David Vierra
7a37e30ea4 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-11-29 14:27:22 -10:00
David Vierra
a3fc5be01b Fix #771 - 9x output on boosted Diesel
Remove an extra efficiency multiplier. `mEfficiency * mEUt` is already done in `GT_MetaTileEntity_MultiBlockBase.onRunningTick`
2016-11-28 18:05:48 -10:00
David Vierra
41ca41240d 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-11-26 05:40:26 -10:00
MauveCloud
9a48e21ecf Fixed whitespace inconsistencies. 2016-11-13 22:45:34 -08:00
MauveCloud
6cfba22529 Fix for negative-coordinate vein generation, adjustments to recipes for stone dust, sand, and flint 2016-11-13 16:41:22 -08:00
MauveCloud
0de96c55d4 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into experimental 2016-11-12 22:47:47 -08:00
David Vierra
99f993a6dd Replace all literal numbers referring to tool types with named constants 2016-11-12 15:44:03 -10:00
Blood-Asp
ea2bae635f Merge pull request #723 from Timeslice42/patch-2
Re-add single-use batteries
2016-11-04 22:16:39 +01:00
Timeslice42
13289969b3 Re-add single-use batteries
How did this get removed? ><
2016-11-04 05:32:56 -07:00
Blood-Asp
1ae2e93ace Merge pull request #703 from Dimach/experimental
Fixed #701.
2016-10-26 01:01:37 +02:00
Dimach
663955f3dc Fixed #701. 2016-10-26 01:09:48 +03:00
Blood-Asp
4fca6d63b6 Fixed charcoal pile igniter bug 2016-10-13 23:12:06 +02:00
Blood-Asp
8190d060a8 Drop Items from Exploding GT Machines + Config 2016-10-13 23:11:57 +02:00
Blood-Asp
4afc5a4a34 Update Multiblock Tooltips 2016-10-13 23:11:35 +02:00
Blood-Asp
d870635bda Optimize hiding of fluid extraction recipes. 2016-10-13 23:11:16 +02:00
Blood-Asp
83e0778e44 Alloy energy hatch in every slice of the assembly line 2016-10-13 23:10:54 +02:00
Blood-Asp
57ff2815eb Move load order for doors to fix malisis doors conflict. 2016-10-13 23:09:55 +02:00
Blood-Asp
6b754b6ebe Revert unwanted Heating Capacity behavior change. 2016-10-13 23:09:42 +02:00
Blood-Asp
f7d2bb95ed Return slabs on paper craft(this time without bug) 2016-10-13 23:09:22 +02:00
Archengius
d9945d93d5 Merge pull request #681 from Dimach/experimental
Added forming press support for processing arrays.
2016-10-12 16:47:35 +07:00
Dimach
000f396b33 Added forming press support for processing arrays. 2016-10-12 10:47:11 +03:00
Blood-Asp
c9b0934d23 Merge pull request #673 from Dimach/experimental
Fixed fluid regulator
2016-10-08 18:08:11 +02:00
Dimach
b66551dc98 Fixed fluid regulator. 2016-10-08 06:50:42 +03:00
Muramasa
b88e197530 Fix GT Crop extraction recipes & Seperate Comb&Crop nerf config option 2016-10-07 16:44:21 +01:00
Muramasa
2f97e5e890 Fix another dumb mistake 2016-10-01 02:03:29 +01:00
Blood-Asp
e607bcc020 fix asteroid worldgen 2016-09-30 22:31:16 +02:00
Blood-Asp
928c07b439 Reenable GregTech Capes 2016-09-30 22:31:04 +02:00
Blood-Asp
aeae594e68 temporary disable returning of slabs on paper craft because of bug 2016-09-30 22:30:30 +02:00
Blood-Asp
4fd6c2ae72 Fix fusion reactor not using input fluids. 2016-09-30 22:30:16 +02:00
Blood-Asp
7079dccb8c Fix short distance teleport & readd null check on tools 2016-09-30 22:30:02 +02:00
Muramasa
c283f7fe36 Temp fix for missing Greg'd recipes 2016-09-29 03:42:44 +01:00
Blood-Asp
51e1704e5e Remove .bats since Curse does not like them. Take from old builds if needed. 2016-09-28 13:05:02 +02:00
Muramasa
7b7e0d8a78 Fix pollution onWorldTick server crash 2016-09-28 08:07:07 +01:00
Muramasa-
0ada20e86f Fixes harvest crash 2016-09-28 05:45:30 +01:00
Blood-Asp
d632ac2ab8 fix interdimensional teleport 2016-09-27 20:31:04 +02:00
Blood-Asp
a6216b8cf0 Count pipe transfers on input not output side 2016-09-27 18:11:19 +02:00
Blood-Asp
7074a513ab Pollution configs and first effects 2016-09-27 16:35:03 +02:00
Blood-Asp
16fb901529 More Pollution & bugfixes 2016-09-27 02:00:19 +02:00
Muramasa-
97d7efcc22 Possible fix for scanner TE error 2016-09-26 14:03:20 +01:00