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

Conflicts:
	core/localization/GuiText.java

2014-05-31 20:58:52 -05:00

..

gui

Renamed ExtraTextures and added ExtraItemTextures.

2014-05-25 20:58:44 -05:00

me

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

2014-05-31 20:58:52 -05:00

render

Paint Balls.

2014-05-31 20:50:56 -05:00

texture

Renamed ExtraTextures and added ExtraItemTextures.

2014-05-25 20:58:44 -05:00

ClientHelper.java

Add support for Mouse Wheel Event passing to Items. the clean way.

2014-05-26 03:25:17 -05:00

EffectType.java

Removed Block Definitions for MAC Parts.

2014-02-23 16:50:53 -06:00