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

Conflicts:
	items/materials/MaterialType.java
	util/Platform.java

2014-05-06 20:45:38 -05:00

..

api

Added IMC Support for P2P / Grinder / Spatial / MatterCannon

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

crash

Rename Configuration to AE Config

2014-02-08 23:08:27 -06:00

features

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

2014-05-06 20:45:38 -05:00

localization

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

2014-05-03 14:12:19 -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-03 14:12:19 -05:00

AEConfig.java

Implemented 5% Tunnel Tax.

2014-05-02 00:40:46 -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

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

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

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

2014-05-06 20:45:38 -05:00

WorldSettings.java

Fixed Dead Lock + Refractor of Compass Service.

2014-03-10 23:33:55 -05:00