tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Mekanism-tilera-Edition/src/main/java/mekanism/common
History
Aidan Brady faad9762df Merge branch 'development' into 1.8 
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
	src/main/java/mekanism/tools/common/MekanismTools.java
2014-08-06 12:56:37 -04:00
..
asm Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
block Merge branch 'development' into 1.8 2014-08-06 12:56:37 -04:00
classloading Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02:00
entity Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
integration Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
inventory Merge branch 'development' into 1.8 2014-08-06 12:56:37 -04:00
item Properly localise fluid names on machine blocks 2014-08-04 01:01:15 +01:00
miner Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
multiblock Generalized the actual manager, and the data manager (by means of reflection) 2014-08-02 00:10:29 -04:00
multipart Merge branch 'development' into 1.8 2014-08-06 12:56:37 -04:00
network Merge branch 'development' into 1.8 2014-08-05 17:06:29 -04:00
recipe 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
tank Generalized the actual manager, and the data manager (by means of reflection) 2014-08-02 00:10:29 -04:00
teleportation Start on framework for energy/fluid/gas/item teleportation 2014-08-02 00:49:00 +01:00
tile Merge branch 'development' into 1.8 2014-08-06 12:56:37 -04:00
transporter Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
util Started on a new, more modular approach to controller-less multiblocks, allowing for the creation of the EIM 2014-08-01 13:04:31 -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 Move Laser range and usage to config 2014-08-04 20:42:04 +01: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 Updated Multiblock Controller textures, added multi-meta capability to Connected Texture Renderer 2014-08-02 11:16:14 -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 Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
FluidNetwork.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +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
IActiveState.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
IAdvancedBoundingBlock.java Fixed a few recipes, also started work on Digital Miner visual 2014-07-20 23:29:35 -04:00
IBoundingBlock.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
IEjector.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
IElectricChest.java Portable Buckets...a lot more work than I thought 2014-06-18 19:42:57 +02:00
IElectricMachine.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
IEnergyCube.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
IFactory.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
IFluidContainerManager.java Lay out the foundation for container edit modes. Also changed the way Dynamic Tank caches work - they are now much more modular and will remember their multiblock inventories on world reload. 2014-07-10 17:51:26 -04:00
IInvConfiguration.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
ILogisticalTransporter.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
IModule.java Major packet work, I think it's done. 34 errors to go! 2014-06-02 17:33:19 +02:00
IRedstoneControl.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
ISpecialBounds.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
ISustainedData.java Started work on a new system of managing sustained data 2014-07-26 18:16:00 -04:00
ISustainedInventory.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
ISustainedTank.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
ItemAttacher.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
ITileComponent.java Alright, almost done with network changes (63 errors!) 2014-06-02 16:52:13 +02:00
ITileNetwork.java Tweaking of lasers for packet-efficiency 2014-07-22 22:34:19 +01:00
IUpgradeItem.java Did some work on actual upgrade system 2014-07-21 20:46:35 -04:00
IUpgradeTile.java Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods 2014-07-23 10:17:03 -04: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 Bump version to 7.1.0. 2014-08-06 12:51:48 -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 Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
PacketHandler.java Merge branch 'development' into 1.8 2014-08-06 12:56:37 -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 Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01: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