Commit graph

587 commits

Author SHA1 Message Date
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
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
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
Blood-Asp
380211de8a fix orehiding hiding all ores instead of only the unneeded. 2016-09-24 19:56:58 +02:00
Blood-Asp
6217cca671 Return slabs on paper crafting and add metal subtags to TungstenCarbine, VanadiumSteel, ect 2016-09-23 19:42:42 +02:00
Muramasa
ec9bd39c02 Fix missing code block 2016-09-23 14:16:53 +01:00
Muramasa-
8f2e13681b Merge pull request #632 from Muramasa-/Bugfixes
Various Bugfixes
2016-09-20 17:03:18 +01:00
Muramasa
a03fc7fc1d That didn't work 2016-09-17 13:27:03 +01:00
Muramasa
769362d60b Reduce Marble/Basalt harvest level and setOreBlock fixes 2016-09-16 15:42:27 +01:00
Muramasa
312141cd10 Fix it again 2016-09-16 12:17:19 +01:00
Muramasa
491925bc59 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp 2016-09-16 12:06:01 +01:00
Muramasa
e981c0db30 One more conflict 2016-09-16 00:27:47 +01:00
Muramasa
6ac01a92c9 Fix conflicts 2016-09-16 00:17:08 +01:00
Blood-Asp
0e60389c41 Fix Tools and lag on reading tooltip 2016-09-15 22:02:18 +02:00
Muramasa
b22bb2dfa6 Update Part 1 2016-09-15 15:48:47 +01:00
Muramasa
b10acf8244 Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp 2016-09-15 15:40:06 +01:00
Blood-Asp
c997df5952 Add Magneticraft compat
and remove Thaumcraft changes because of bugs/no improvements
And add config to arc smelt not annealed/wought.
2016-09-15 16:36:08 +02:00