Mekanism-tilera-Edition/src/main/java/mekanism/common
Aidan C. Brady 775e1fbd6d Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
2014-08-24 09:51:12 -04:00
..
asm Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
base Logistical Transporter path caching. 2014-08-21 20:46:51 -04:00
block Reorganized package structure to separate content from base code 2014-08-20 15:22:55 -04:00
classloading Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02:00
content Laid foundation for Industrial Turbine and Thermoelectric Boiler 2014-08-23 11:41:35 -04:00
entity A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
integration Fixed a few GUI bugs 2014-08-23 15:46:13 -04:00
inventory Merge branch 'development' into 1.8 2014-08-20 14:38:46 -04:00
item Transmitter networks now keep track of all connected sides of acceptors. This should fix many future bugs, and it will also allow me to implement a better caching system for Logistical Transporters. 2014-08-15 16:21:58 -04:00
multiblock Implemented the new changes into TankUpdateProtocol 2014-08-22 23:12:01 -04:00
multipart Logistical Transporter path caching. 2014-08-21 20:46:51 -04:00
network Reorganized package structure to separate content from base code 2014-08-20 15:22:55 -04:00
recipe A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
tile Merge branch 'development' into 1.8 2014-08-24 09:51:12 -04:00
util Logistical Transporter path caching. 2014-08-21 20:46:51 -04:00
voice Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
world Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
BoxBlacklistParser.java Update box blacklist to parse with block name instead of ID 2014-06-09 17:05:57 +02:00
CommandMekanism.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
CommonPlayerTickHandler.java Started work on actual flame implementation 2014-07-17 20:06:51 -04:00
CommonPlayerTracker.java Major Flamethrower work - finished networking and implemented active state management. Active sound effects work, too. 2014-07-17 17:18:53 -04:00
CommonProxy.java Added prefab classes for UpdateProtocol and ThreadMultiblockSparkle, still yet to get the Dynamic Tank to extend them 2014-08-22 18:34:19 -04:00
CommonWorldTickHandler.java Fixes! The new system just about works, I just need to work on Dynamic Tank inventory merging. 2014-08-01 22:28:13 -04:00
ConnectedTextureRenderer.java Fixed a connected texture renderer bug 2014-08-08 22:43:46 -04:00
CoreGuiHandler.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
CreativeTabMekanism.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
EnergyNetwork.java Merge branch 'development' into 1.8 2014-08-19 19:08:47 -04:00
FluidNetwork.java Get rid of two redundant factory methods. 2014-08-17 04:18:34 +01:00
FluidSlot.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
FuelHandler.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
HashList.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
InventoryNetwork.java Work on path caching 2014-08-20 15:54:05 -04:00
ItemAttacher.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
KeySync.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
LaserManager.java Move Laser range and usage to config 2014-08-04 20:42:04 +01:00
Mekanism.java Laid foundation for Industrial Turbine and Thermoelectric Boiler 2014-08-23 11:41:35 -04:00
MekanismBlocks.java Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
MekanismItems.java Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
ObfuscatedNames.java 0 errors. This is it, the first building build of Mekanism for 1.7.2, and also the most buggy build of Mekanism to date most likely. 2014-06-03 00:21:00 +02:00
OreDictCache.java Merge branch 'development' into 1.8 2014-08-19 19:08:47 -04:00
PacketHandler.java Merge branch 'development' into 1.8 2014-08-07 23:02:11 -04:00
Resource.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
RobitAIFollow.java Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
RobitAIPickup.java Sound system work 2014-06-02 23:57:40 +02:00
SideData.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
Teleporter.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
ThreadGetData.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
Tier.java Fixed the addition of the "creative control circuit" 2014-07-31 21:08:46 -04:00
Upgrade.java A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
Version.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00