Commit graph

752 commits

Author SHA1 Message Date
AlgorithmX2
2de3ab4505 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-10 22:02:23 -05:00
AlgorithmX2
02a8aef5a3 FMP Almost ready. 2014-04-10 21:50:27 -05:00
AlgorithmX2
79bbdd0bd1 host now responsible for cleanup, fixes onWrench MultiPart deletion. 2014-04-10 15:01:04 -05:00
AlgorithmX2
327c1d4118 Ported FMP Support to 1.7. 2014-04-10 14:52:17 -05:00
AlgorithmX2
f8d60e801a Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-10 00:59:15 -05:00
AlgorithmX2
661afe846c Fixed Bug with P2P Tunnels not disconnecting in certain cases. 2014-04-10 00:58:56 -05:00
AlgorithmX2
d84be03027 Large chunk on the pattern terminal. 2014-04-09 23:51:08 -05:00
AlgorithmX2
01c76a6870 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-09 20:12:49 -05:00
AlgorithmX2
6b244b341b Don't discriminate against blocks with custom rotation. 2014-04-09 20:02:34 -05:00
AlgorithmX2
2450267957 You don't have to be active to be removed, that's silly 2014-04-09 19:52:31 -05:00
AlgorithmX2
b33d0771d6 Should fix CME. 2014-04-09 19:52:13 -05:00
AlgorithmX2
e8c2725551 Minor enhancement to Error message. 2014-04-09 15:41:13 -05:00
AlgorithmX2
ac0c562b02 Fixed Channel requirements for illuminated panels. 2014-04-09 14:22:36 -05:00
AlgorithmX2
db6a958a6f Fix Interface Crash caused by negative items. 2014-04-09 14:22:17 -05:00
AlgorithmX2
344c9eb370 Allow Subclasses of PlayerInventory. 2014-04-08 23:26:04 -05:00
AlgorithmX2
be1b22a3ee Crash, no log! 2014-04-08 22:14:03 -05:00
AlgorithmX2
316822fe71 Better Errors in GuiBridge. 2014-04-08 22:12:01 -05:00
AlgorithmX2
7dc251611c tiny progress... 2014-04-08 21:56:59 -05:00
AlgorithmX2
6203b172f6 Better Solution for extra energy injection. ( Fixes Crash ) 2014-04-07 21:31:36 -05:00
AlgorithmX2
0cec53eece More Pattern Terminal Stuff. 2014-04-07 21:25:41 -05:00
AlgorithmX2
2ebca04296 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-07 19:47:39 -05:00
AlgorithmX2
7a0674a75b Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-07 19:46:27 -05:00
AlgorithmX2
0a9bb1eb2f Storage Bus now updates render when changing statuses. 2014-04-07 19:45:38 -05:00
AlgorithmX2
85b3a5ef32 Started Work on Pattern Terminal. 2014-04-07 19:43:57 -05:00
AlgorithmX2
9cd502ed56 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-07 11:27:36 -05:00
AlgorithmX2
85ffe63ebe Toggle Buses Don't need Channels. 2014-04-07 11:27:00 -05:00
AlgorithmX2
2e103efab8 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	tile/misc/TileCellWorkbench.java
2014-04-06 18:20:20 -05:00
AlgorithmX2
1ae63261ed Workbench now drops the cell inside it if broken. 2014-04-06 18:14:28 -05:00
AlgorithmX2
13b3555d01 Added Copy Mode to the Cell Workbench. 2014-04-06 18:05:09 -05:00
AlgorithmX2
ee42c53f89 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-06 14:12:52 -05:00
AlgorithmX2
72219780ef AE Optional Transformer should not be fully operational. 2014-04-06 03:20:51 -05:00
AlgorithmX2
14f93f66f6 Moved NEI Check to constructor. 2014-04-06 03:20:30 -05:00
AlgorithmX2
0036e050ca Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-06 01:55:36 -05:00
AlgorithmX2
5248eeeace Switched from FML Optional to AE Optional, lets me specify more interesting requirements for integration, and lets the config alter the resulting integration setup. 2014-04-06 01:55:24 -05:00
AlgorithmX2
97c06db6ef Use ordinal of parts/items as the default meta, allows for holes in the setup but lets default configs be consistent regardless of other mods. 2014-04-06 01:51:44 -05:00
AlgorithmX2
028555bc8a Fixed Fluid Render. 2014-04-05 21:50:01 -05:00
AlgorithmX2
efa931a7a1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-05 15:30:09 -05:00
AlgorithmX2
86c2ad49ee Removed Facade Creative Tab when they are disabled.
Added Sky Stone to BC's Facades.
2014-04-04 10:46:05 -05:00
AlgorithmX2
5571467f20 Added Basic NEI Support 2014-04-04 00:17:20 -05:00
AlgorithmX2
c73ce116c5 Removed Totally unused class. 2014-04-03 23:31:24 -05:00
AlgorithmX2
59f3c703e2 Separated Textures for many parts. 2014-04-03 23:31:10 -05:00
AlgorithmX2
27f374eb04 Added Rotatable Blocks integration. 2014-04-03 23:12:35 -05:00
AlgorithmX2
26b1a2abf9 Fixed Bug: #0267 - Improved Arbitrary rotation? 2014-03-31 22:24:28 -05:00
AlgorithmX2
d3ac967eaa Fixed Bug: #0268 - MC Ladders, any way to prevent slow down? 2014-03-31 22:23:50 -05:00
AlgorithmX2
697d81d895 Fixed Obfuscation Issue with Guis. 2014-03-29 22:19:15 -05:00
AlgorithmX2
c82663c1ac Fixed Bug: #0255 - Making a new world with AE2 loaded causes it to not save chunks. 2014-03-29 19:23:11 -05:00
AlgorithmX2
794177b8d2 Fixed Bug: #0260 - Hotbar Keys + Inscriber 2014-03-29 18:36:37 -05:00
AlgorithmX2
740e9e27bf Fixed Bug: #0251 - Max Power De-Synced from network components. 2014-03-29 04:03:35 -05:00
AlgorithmX2
34b81439f4 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-03-29 03:55:11 -05:00
AlgorithmX2
35afab233e Fixed Bug: #0254 - Icon of Crystal Seeds overlapping durability bar 2014-03-29 03:55:02 -05:00