Applied-Energistics-2

T

AlgorithmX2 68993534d9 Slowly working towards crafting.

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

Conflicts:
	client/gui/widgets/GuiImgButton.java
	core/localization/ButtonToolTips.java

2014-05-18 20:05:03 -05:00

block

Crafting CPU basics.

2014-05-17 22:19:23 -05:00

client

Slowly working towards crafting.

2014-05-18 20:05:03 -05:00

container

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

2014-05-15 09:35:56 -05:00

core

Slowly working towards crafting.

2014-05-18 20:05:03 -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

Slowly working towards crafting.

2014-05-18 20:05:03 -05:00

hooks

Fixed Dormant Chunk Cache.

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

integration

Removed Alpha Migration.

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

items

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

2014-05-15 09:35:56 -05:00

Slowly working towards crafting.

2014-05-18 20:05:03 -05:00

parts

Slowly working towards crafting.

2014-05-18 20:05:03 -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

Slowly working towards crafting.

2014-05-18 20:05:03 -05:00

transformer

Removed Alpha Migration.

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

util

Slowly working towards crafting.

2014-05-18 20:05:03 -05:00

.gitmodules

AE2 First Commit, the dawn of 1.7 hast arrived.

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