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

block

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

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

client

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

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

container

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

2014-05-03 14:12:19 -05:00

core

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

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

debug

Renamed Inscriber Recipe Type to Inscribe.

2014-03-08 21:35:53 -06:00

entity

Removed Block Definitions for MAC Parts.

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

facade

Major Update for Cable Rendering.

2014-05-04 19:51:05 -05:00

fmp

Major Update for Cable Rendering.

2014-05-04 19:51:05 -05:00

helpers

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

2014-05-03 19:23:48 -05:00

hooks

Networks now run at 1x speed.

2014-04-17 19:44:51 -05:00

integration

Updated RF Api ( should work for old api too - at least temporary ).

2014-05-06 18:09:31 -05:00

items

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

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

me

Special Handlers are now properly wrapped in IMEMonitors for Storage Bus to function properly.

2014-05-03 19:21:33 -05:00

migration

Fixed Crash with Extra Utilities.

2014-05-06 12:08:48 -05:00

parts

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

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

recipes

Fixed Crash with Extra Utilities.

2014-05-06 12:08:48 -05:00

server

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

services

Spatial "Sky Render"

2014-03-15 14:53:00 -05:00

spatial

Spatial "Sky Render"

2014-03-15 14:53:00 -05:00

tile

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

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

transformer

Remove Meta values from Config.

2014-05-06 00:16:29 -05:00

util

Fixed possible crash with Interfaces and Storage Buses.

2014-05-04 14:54:21 -05:00

.gitmodules

AE2 First Commit, the dawn of 1.7 hast arrived.

2013-12-27 16:59:59 -06:00

S

Description

AE2UEL, a Fork of a Minecraft Mod about Matter, Energy and using them to conquer the world.

LGPL-3.0 31 MiB

Languages

Java 100%