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

Conflicts:
	items/tools/powered/ToolMassCannon.java

2014-06-04 23:05:22 -05:00

block

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

2014-06-04 23:05:22 -05:00

client

Keep Search when switching between crafting and normal view.

2014-06-02 21:04:47 -05:00

container

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

2014-05-25 00:03:27 -05:00

core

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

2014-06-04 00:07:57 -05:00

crafting

Some more crafting work.

2014-06-04 22:54:01 -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

Removed Alpha Migration.

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

helpers

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

2014-06-02 01:44:48 -05:00

hooks

Added Paint Balls.

2014-05-26 03:26:37 -05:00

integration

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

2014-06-04 00:07:57 -05:00

items

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

2014-06-04 23:05:22 -05:00

me

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

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

parts

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

2014-06-03 20:49:40 -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-06-04 23:05:22 -05:00

transformer

Null classes are bad umm kay.

2014-05-23 15:51:25 -05:00

util

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

2014-06-04 23:05:22 -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%