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

Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java

2014-05-13 19:25:07 -05:00

block

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

2014-05-13 19:25:07 -05:00

client

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

2014-05-13 19:25:07 -05:00

container

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

2014-05-13 19:25:07 -05:00

core

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

2014-05-13 19:25:07 -05:00

debug

Renamed Inscriber Recipe Type to Inscribe.

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

entity

Added all the crafting cpu "blocks" - needs textures and renders.

2014-05-10 00:00:02 -05:00

facade

changing facades now updates the world render.

2014-05-11 11:30:00 -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-13 19:25:07 -05:00

hooks

Fixed Dormant Chunk Cache.

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

integration

Fix Crashes for MJ5.

2014-05-11 17:01:31 -05:00

items

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

2014-05-13 19:25:07 -05:00

me

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

2014-05-13 19:25:07 -05:00

migration

Code Style / Cleanup

2014-05-11 13:30:54 -05:00

parts

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

2014-05-13 19:25:07 -05:00

recipes

Added all the crafting cpu "blocks" - needs textures and renders.

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

Minor derp.

2014-05-12 23:28:29 -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-13 19:25:07 -05:00

transformer

Did what I could with mj6

2014-05-09 21:08:56 -05:00

util

Code Style / Cleanup

2014-05-11 13:30:54 -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%