tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3102 commits 2 branches 0 tags 102 MiB
Commit graph

1111 commits

Author SHA1 Message Date
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
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
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
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
emperor06
447e81c1be Added ComputerCraft support to Induction Matrix. 2015-04-16 17:35:48 +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
9d76df996c Tiny cleanup 2015-04-13 08:19:36 -04: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
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
17e1cea25a Possible fix for EnergyNet weirdness. 2015-04-11 14:27:21 +01:00
Ben Spiers
420e1619e6 Clean up some TransporterPathfinder stuff. 2015-04-10 23:55:59 +01:00
Ben Spiers
7b4404a973 Remove an unused parameter. 2015-04-10 23:55:59 +01:00
Ben Spiers
91d323ccdd Maybe fix negative buffer issues . 2015-04-10 23:55:59 +01:00
Ben Spiers
05508b598a Fix non-overworld dimensions. 2015-04-10 19:21:34 +01:00
Ben Spiers
5b558065fc Might fix the NPE in FluidNetwork that @NitroxydeX was experiencing 2015-04-10 18:54:38 +01:00
Ben Spiers
468abefe17 Fix NPE on creating networks. 2015-04-10 18:39:27 +01:00
Ben Spiers
cb95cfeedd Fix ITubeConnection acceptors that aren't IGasHandler 2015-04-10 18:39:06 +01:00
Aidan C. Brady
5fec517a6d Crash fix 2015-04-10 08:34:02 -04:00
Aidan C. Brady
174509444b Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-04-10 08:24:34 -04:00
Aidan C. Brady
a03ef85f4c Fixed compile, bumped version to 8.1.1 2015-04-10 08:24:28 -04:00
Ben Spiers
94189a4f61 Fix Transporters with multipart. 2015-04-09 02:39:23 +01:00
Ben Spiers
4ca9456de8 Use path score to sort paths, not length. 2015-04-09 02:39:23 +01:00
Ben Spiers
36f0607d5e Prioritise faster paths, by making cost inversely proportional to speed. 2015-04-09 02:39:23 +01:00
Aidan C. Brady
068e4b58a7 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-04-07 10:42:50 -04:00
Aidan C. Brady
12ebfe6745 ThreadSparkle is now operated in main client thread time - new safety checks will prevent serious lag anyway 2015-04-07 10:41:17 -04:00
Ben Spiers
4a2dde8f87 Fix API, put back some methods that GC uses, optimise imports in API. 2015-04-06 18:53:16 +01:00
Aidan C. Brady
034d732e15 A bit more tidying 2015-04-06 11:10:57 -04:00
Aidan C. Brady
ec7b0555c9 Cleanup 2015-04-06 11:08:57 -04:00
Aidan
841e358ce0 Merge pull request #2478 from aidancbrady/networkRefactor 
Network Refactor
 2015-04-06 11:00:45 -04:00
Aidan C. Brady
a61974a681 Cleanup 2015-04-06 10:12:59 -04:00
Ben Spiers
1997054bad Merge branch 'development' into networkRefactor 2015-04-06 04:36:11 +01:00