Commit graph

3284 commits

Author SHA1 Message Date
aidancbrady
c2f7735115 Fixed a Bin issue 2015-05-28 16:43:01 -04:00
aidancbrady
1b41d04b93 Prevent bins from stacking 2015-05-28 16:39:57 -04:00
aidancbrady
18c0159680 Removed CLR buttons from chemical processing machines in favor of new gauge dropper functionality 2015-05-28 16:34:25 -04:00
aidancbrady
917430bf5c You can now dump any tank by shift-clicking its gauge with a gauge dropper 2015-05-28 16:27:06 -04:00
aidancbrady
b6264891f1 Fixed a small Gas Generator crash 2015-05-28 16:22:00 -04:00
aidancbrady
f95bfbb600 Fix console spam, we don't really need that anyway 2015-05-28 10:32:05 -04:00
aidancbrady
95565b38c3 Added Heavy Water Bucket! 2015-05-23 11:59:43 -04:00
aidancbrady
654bce3c7d Fixed advanced machine item input logic 2015-05-23 11:44:19 -04:00
aidancbrady
4613dcb55f Implemented BuildCraft style of dummy player, integrated with BlockEvent.BreakEvent in Digital Miner and Laser logic 2015-05-23 11:36:53 -04:00
aidancbrady
173be49a4a Merge branch 'master' into development 2015-05-22 23:07:51 -04:00
Aidan
92f969b0fc Merge pull request #2656 from LemonLake/master
Fixed Pressurised Tubes being named incorrectly in en_GB
2015-05-22 23:07:25 -04:00
aidancbrady
384bf643e0 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-05-22 13:06:51 -04:00
aidancbrady
fa71836e0d Fixed bad cast, fixed tubes and pipes losing capacity after world load 2015-05-22 13:06:46 -04:00
Aidan
08ebefec61 Merge pull request #2660 from tterrag1098/development 2015-05-20 14:55:10 -04:00
tterrag1098
b70c0e015f Remove hard dep on unnecessarily new forge version 2015-05-13 17:18:21 -04:00
Lemmmy
273955a522 Fixed Pressurised Tubes being named incorrectly in en_GB 2015-05-12 18:37:36 +01:00
aidancbrady
0b04665055 Another fluid tank fix 2015-05-11 10:42:58 -04:00
aidancbrady
1377ec88e8 Fixed circuit OreDict implementation 2015-05-10 19:45:09 -04:00
aidancbrady
6a25667b20 Added property to prevent world damage by flamethrowers & lasers 2015-05-10 19:33:28 -04:00
aidancbrady
909e80ff77 Fixed a transporter crash, don't scale Electrolytic Separator energy usage 2015-05-10 19:20:36 -04:00
aidancbrady
9ffc1bdff3 Localization fixes, part 1 2015-05-10 19:04:42 -04:00
aidancbrady
0c2707cd05 Made sparkle animation less cpu intensive 2015-05-09 18:47:34 -04:00
aidancbrady
1c8c12ee88 Fixed a small Dynamic Tank bug 2015-05-09 18:12:41 -04:00
aidancbrady
c62e27d5fd Configurable armored jetpack resistance values, quadrupled brine production rate of SE plants 2015-05-06 08:34:04 -04:00
aidancbrady
09ba6fd8b4 Fixed block rotations 2015-05-05 10:57:34 -04:00
aidancbrady
3185f1bf22 Bumped version to 8.1.3 2015-05-05 10:45:59 -04:00
Aidan
135985f973 Merge pull request #2621 from Adaptivity/patch-2
Update ru_RU.lang
2015-05-05 10:40:37 -04:00
Anton
ec4691abf8 Update ru_RU.lang 2015-05-04 10:46:43 +03:00
Aidan
dd7178b53a Merge pull request #2612 from TheVikingWarrior/patch-3 2015-05-02 17:06:26 -04:00
TheVikingWarrior
314d3bd699 Update it_IT.lang
Finished it, but I'd like to remind you of issue https://github.com/aidancbrady/Mekanism/issues/2406 for the best translation
2015-05-02 00:36:20 +02:00
aidancbrady
a32d6f4953 A few fixes 2015-04-28 08:24:54 -07:00
aidancbrady
33ff01b436 Fixed transporters 2015-04-27 11:09:20 -07:00
aidancbrady
281836fc4a Revert "Oops, forgot to update the miner inventory slots"
This reverts commit 93a1789053.
2015-04-26 19:41:10 -07:00
aidancbrady
c839ce5697 Revert "Changes to GUI's for more flexibility & consistancy"
This reverts commit 61406c2b2d.
2015-04-26 19:41:03 -07:00
aidancbrady
2cbcaf0a3b Added Podzol recipe 2015-04-26 19:39:02 -07:00
aidancbrady
abce650fd4 Maybe fix bad transporters 2015-04-26 12:44:46 -07:00
aidancbrady
b44f7a999b Fixed Digital Miner starting on world load 2015-04-26 12:24:49 -07:00
aidancbrady
d3efaa6b09 Fix CCC version 2015-04-25 15:31:35 -07:00
aidancbrady
9414b74f60 Fix build? 2015-04-25 15:28:21 -07:00
Aidan Brady
3c1bbc978e Hopefully fixed Forge version 2015-04-25 13:19:32 -07:00
Aidan Brady
8030b0e057 Fixed icons, bumped Mekanism version to 8.1.2, bumped Forge to 1395, updated CB libraries 2015-04-25 13:14:10 -07:00
Aidan
f5214cacec Merge pull request #2585 from TehStoneMan/development
Changes to GUI's
2015-04-25 11:21:12 -07:00
TehStoneMan
f8d6993f0f Merge remote-tracking branch 'upstream/development' into development 2015-04-24 11:02:08 +10:00
TehStoneMan
93a1789053 Oops, forgot to update the miner inventory slots 2015-04-24 10:58:38 +10:00
Aidan
30a449907d Merge pull request #2579 from RAWRwins254/development 2015-04-23 13:00:43 -04:00
TehStoneMan
61406c2b2d Changes to GUI's for more flexibility & consistancy
First stage of changing GUI's to add flexibility to elements, and
consistancy of visual design. Not all devices have been updated yet.
2015-04-24 00:14:03 +10:00
RAWRwins254
746ed3f5d7 Fixing NPE from EnergyAcceptorWrapper.java not handling ticks that aren't related to a TileEntity. 2015-04-23 01:46:04 -05:00
Ben Spiers
5baf4605e0 Fix FluidStack now being amount-specific in its hashCode() method. 2015-04-17 18:29:57 +01:00
Ben Spiers
e6ee804686 Update forge again. 2015-04-17 18:27:41 +01:00
Ben Spiers
0919a82484 Merge branch 'master' into development 2015-04-17 18:01:03 +01:00