Commit graph

3259 commits

Author SHA1 Message Date
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
Ben Spiers
d8c26c3ed0 Hopefully fix some RF problems with pseudo-acceptors. 2015-04-17 17:44:02 +01:00
Aidan
f1b0410cad Merge pull request #2551 from emperor06/CC_InductionMatrix
Added ComputerCraft support to Induction Matrix.
2015-04-16 17:55:20 -04:00
emperor06
447e81c1be Added ComputerCraft support to Induction Matrix. 2015-04-16 17:35:48 +02:00
Aidan C. Brady
32a0e0ff4e Merge branch 'master' into development 2015-04-16 11:28:14 -04:00
Aidan
73ddd32eca Merge pull request #2547 from Mazdallier/patch-2
Update fr_FR.lang
2015-04-16 11:27:49 -04:00
Yves
b9bfbad96c Update fr_FR.lang 2015-04-16 12:29:20 +02:00
Aidan C. Brady
308233720c Temporary fix for multiple buffer type merges 2015-04-15 12:52:07 -04:00
Aidan C. Brady
2c53ce6956 Configurator's "empty" mode now only works on Mekanism container blocks 2015-04-15 12:44:52 -04:00
Aidan C. Brady
425f0c27c3 Prevent crash when creating EnergyAcceptorWrapper 2015-04-14 10:55:38 -04:00
Aidan C. Brady
33f19cf895 Fixed a crash 2015-04-13 08:43:08 -04:00
Aidan C. Brady
36a2335350 Merge branch 'master' into development 2015-04-13 08:21:05 -04:00
Aidan
ab1e05c2f6 Merge pull request #2517 from Mazdallier/patch-1
Update fr_FR.lang
2015-04-13 08:20:48 -04:00
Aidan C. Brady
9d76df996c Tiny cleanup 2015-04-13 08:19:36 -04:00
Yves
1d6fc0918c Update fr_FR.lang 2015-04-13 09:08:56 +02:00
Aidan C. Brady
c61e4c116b Cleanup 2015-04-12 17:19:32 -04:00
Aidan C. Brady
da661af41c Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2015-04-12 17:16:21 -04:00
Aidan C. Brady
f89f3c1aaa Fixed hash code assignment 2015-04-12 17:16:16 -04:00
Ben Spiers
03e45cc401 Back to Forge 1291.
Turns out I do silly things when I'm tired...
2015-04-12 03:38:33 +01:00
Ben Spiers
866abf5c8d Fix build. 2015-04-12 00:38:28 +01:00
Ben Spiers
c23aafee9f Should fix the NPE in updateTransmitterOnSide. 2015-04-12 00:19:49 +01:00
Ben Spiers
75b41170d3 Merge branch 'master' into development 2015-04-12 00:13:13 +01:00
Ben Spiers
66ce6c6827 Update dependencies. 2015-04-12 00:12:40 +01:00
Ben Spiers
13221b5bf3 Remove some unused methods. 2015-04-12 00:12:18 +01:00
Ben Spiers
d73eed2865 Fix the draining issue 2015-04-12 00:09:35 +01:00
Ben Spiers
d3c9e73aa7 Possible fix for EnergyNet weirdness. 2015-04-11 14:28:05 +01:00