AlgorithmX2 01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ...

Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java

2014-05-22 18:49:02 -05:00

..

api

Added IMC Support for P2P / Grinder / Spatial / MatterCannon

2014-04-17 21:52:39 -05:00

crash

WTF is java making this stupid class for!

2014-05-21 13:24:58 -05:00

features

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-05-22 18:49:02 -05:00

localization

Slowly working towards crafting.

2014-05-18 20:05:03 -05:00

settings

Adjustable Tick Rates.

2014-03-17 14:59:50 -05:00

sync

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-05-22 18:49:02 -05:00

AEConfig.java

Added Comments for Enum Settings.

2014-05-22 16:29:10 -05:00

AELog.java

Added GrinderLogging and hid Grinder Logging behind it.

2014-05-06 14:56:06 -05:00

Api.java

Recipe API Update.

2014-02-19 17:33:36 -06:00

AppEng.java

Crash Enhancement Tweak!

2014-05-12 21:15:31 -05:00

CommonHelper.java

Move RenderManager interaction to Post Init ( fixes some kind of weird conflict with a key bind mod )

2014-04-19 20:41:43 -05:00

CreativeTab.java

Ported to 1.7

2014-02-08 19:34:52 -06:00

CreativeTabFacade.java

Ported to 1.7

2014-02-08 19:34:52 -06:00

FacadeConfig.java

Added Meteorite Spawn Distance Setting.

2014-03-15 01:58:21 -05:00

Registration.java

Crafting Cache Registered and added events.

2014-05-19 23:13:12 -05:00

WorldSettings.java

Removed Alpha Migration.

2014-05-15 21:18:30 -05:00