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

146 commits

Author SHA1 Message Date
Aidan Brady
799142198a Fixed ridiculous client updates when GUI is open, fancy active sorter rendering, sorter eject sound effect :) 2013-11-01 23:51:10 -04:00
Aidan Brady
8db9c734d7 Sorter no longer requires energy, gave sorter new fancy model, improved the way items retreat from dead ends 2013-11-01 22:36:06 -04:00
Aidan Brady
c281fcb14b Fix up a bunch of issues. This should fix epicbastion's problem honestly. 2013-11-01 19:14:02 -04:00
Aidan C. Brady
6837b1fb66 Bumped version! 2013-10-29 19:31:26 -04:00
Aidan C. Brady
a2443f902d Fix generator names 2013-10-28 14:48:41 -04:00
Aidan C. Brady
5a748c5ff6 More work on the Logistical Sorter! 2013-10-25 08:51:13 -04:00
Aidan C. Brady
51289b82c2 Made base code for Logistical Sorter, this may end up being more complex than the transporters themselves. 2013-10-25 00:23:38 -04:00
Aidan Brady
4b82ab6cc1 Work on transporters, don't use them unless you like buggy item transport pipes that currently do nothing 2013-10-20 22:47:20 -04:00
Aidan C. Brady
9194f71630 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/common/Mekanism.java
 2013-10-13 01:04:04 -04:00
Aidan C. Brady
b1c2afd68d Add proper IC2 item support, add maganese for future use 2013-10-13 01:01:30 -04:00
Ben Spiers
189c6d4551 L10n support by popular demand. Closes #204 2013-10-12 16:43:56 +01:00
Ben Spiers
3c73914337 Merge branch 'master' of github.com:aidancbrady/Mekanism 2013-10-12 15:39:01 +01:00
Aidan C. Brady
9735363dc1 Update IC2 API, minor enhancements and fixes 2013-10-08 18:06:25 -04:00
Ben Spiers
e05479a909 Update every applicable API, remove some unused imports 2013-09-30 22:37:16 +01:00
Ben Spiers
a4222a86f0 Update obf 
Conflicts:
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
 2013-09-28 03:06:41 +01:00
Aidan C. Brady
86b8499bb5 A bit more organizing, nothing API related 2013-08-26 18:57:08 -04:00
Aidan C. Brady
6af0b1abd7 Screw it, package organization (sorry, that's an API update) 2013-08-26 18:49:32 -04:00
Aidan C. Brady
13a47bbc96 Final changes in upgrade GUI modularization, will work on factory recipe type GUI modularization next 2013-08-26 18:28:55 -04:00
Ben Spiers
32c32fb106 Move checkTransmissionType to TransmissionType. 2013-08-25 02:41:03 +01:00
Ben Spiers
8f4b19f87c A slightly surprisingly large number of unused imports 2013-08-23 19:25:26 +01:00
Aidan C. Brady
5e379f052a Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/api/GasNetwork.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/InventoryNetwork.java
	common/mekanism/common/TileEntityEnergyCube.java
	common/mekanism/generators/common/TileEntityGenerator.java
 2013-08-22 14:07:28 -04:00
Aidan C. Brady
5072b20673 Updated IC2 API, modularized energy management 2013-08-22 11:36:31 -04:00
Ben Spiers
e598527656 Fix StackOverflowException on getNetwork. 2013-08-21 20:26:47 +01:00
Ben Spiers
19cea5b35c PowerReceiver can sometimes be null 2013-08-19 21:29:14 +01:00
Aidan Brady
30f7bfa126 Loads of work on modularization, BROKEN BUILD 2013-08-18 21:32:47 -04:00
Aidan Brady
3fd76dcacc Began work on Logistical Transporter - item transport :) 2013-08-03 23:02:06 -04:00
Aidan Brady
47c36f1f38 Added redstone control to machines, generators, Energy Cubes and Gas Tanks; fixed Heat Generator NBT bug 
Also - cleanup! Closes #214.
 2013-08-02 03:16:38 -04:00
Aidan Brady
55bde8a4b9 There is now a configurable delay between state updates, closes #177 2013-08-01 12:07:03 -04:00
Aidan Brady
9e51cdd4bc Fixed Energy Cube/Generator UE energy outputting 2013-08-01 11:23:07 -04:00
Aidan Brady
ec42d430df Fixed Forestry integration 2013-08-01 00:50:18 -04:00
Aidan Brady
4c50c442d1 Better BC item integration, javadocs, cleanup 2013-07-31 21:20:12 -04:00
Aidan Brady
0b5d188cd7 More ratio fixes, Electric Chest GUI now has energy tooltip 2013-07-31 17:00:30 -04:00
Aidan Brady
fc964ad8db Cleanups, fixed UE ratios 2013-07-31 16:44:53 -04:00
Aidan Brady
c389f5bd34 Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
Aidan Brady
db5588ddb9 Fixed StackOverflowException with MFR, fixed incorrect UE charging values 2013-07-27 19:32:46 -04:00
Aidan Brady
dedb2ebdcf Fixed ControlCircuit recipe bug 2013-07-27 12:01:08 -04:00
Aidan Brady
5d26f8e229 Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
Aidan Brady
13400fdc3d Bumped version to 5.5.7 2013-07-20 12:35:37 -04:00
Aidan Brady
26e86c8eee Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/RenderMechanicalPipe.java
	common/mekanism/common/BlockBasic.java
 2013-07-20 12:15:34 -04:00
Aidan Brady
cfc5dff445 First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
Ben Spiers
ec9d74fe1a Hopefully solve all the rendering-based memory leaks 2013-07-19 19:59:01 +01:00
Aidan Brady
ce09a8225f Formatted EnergyMeter PR, merged Energy Cube comparator support 2013-07-07 13:07:40 -04:00
Aidan Brady
540823ef4a Removed Wind Turbine bound checking 2013-07-07 12:17:51 -04:00
Aidan Brady
bc4a34c189 Less client-based lag on machines and generators 2013-07-07 12:13:52 -04:00
Aidan Brady
8f6ad2688e General cleanup 2013-06-28 19:43:45 -04:00
Aidan Brady
b255a98a74 Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00