tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
626 commits 7 branches 98 tags 24 MiB
Commit graph

169 commits

Author SHA1 Message Date
AlgorithmX2 e2c3e18133 Added Crafting/Stored/Both setting to ItemRepo 2014-05-22 21:41:09 -05:00
AlgorithmX2 01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java
 2014-05-22 18:49:02 -05:00
AlgorithmX2 cbe41337ed Added Clear and Partition Based on contents to Storage Bus. 2014-05-21 21:09:29 -05:00
AlgorithmX2 269bc40f0d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 22:17:52 -05:00
AlgorithmX2 dc0c015a97 Fix NPE. 2014-05-20 22:06:48 -05:00
AlgorithmX2 fa1feff8f0 Added View Button ( dosn't work ) 2014-05-19 23:13:25 -05:00
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
AlgorithmX2 440ac95dc4 Change Tooltip for clear button in Crafting Terminal. 2014-05-18 14:53:18 -05:00
AlgorithmX2 b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2 cfeebae5ac First pass at trying to make a CPU render - is basically a multiblock heat vent at this point. 2014-05-15 09:34:38 -05:00
AlgorithmX2 322b0a7da7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-13 21:57:17 -05:00
AlgorithmX2 974a41eabb Solved the mystery of the broken lighting. 2014-05-13 21:56:57 -05:00
AlgorithmX2 6a8fafa58d Working Towards Crafing CPU MultiBlock 2014-05-13 21:42:14 -05:00
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
AlgorithmX2 ff12aa1673 Added Shit+Mouse wheel to pick up / drop items. 
Added Partial ItemStack packets to report to the server what itemstack is the target of interation.
Fixed Repairing Items in CraftingTerminal.
 2014-05-12 23:11:19 -05:00
AlgorithmX2 d84ec9c0bf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-10 17:19:26 -05:00
AlgorithmX2 570f098f81 Fixed a few more rendering/visual update glitches. 2014-05-10 13:27:48 -05:00
AlgorithmX2 b0aedc1b01 MAC Now shows progress. 2014-05-08 23:09:42 -05:00
AlgorithmX2 39282b8e14 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-07 20:54:49 -05:00
AlgorithmX2 0338902021 No more null icons! 2014-05-07 20:54:28 -05:00
AlgorithmX2 dd74fce634 Added some assertions about null icons. 2014-05-07 17:21:48 -05:00
AlgorithmX2 1db9283eed Swapped out Gui Sync with something a little more fancy. 2014-05-07 00:22:42 -05:00
AlgorithmX2 24d497e583 MAC Gui upgrade slots and network tool fixes. 2014-05-06 21:21:12 -05:00
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
AlgorithmX2 3080510317 Major Update for Cable Rendering. 
TESRs will are no longer used if the tile contains no dynamic renders.
Added alpha pass rendering for stained glass.
Enabled Stained Glass facades.
Cables / Facades have less geometry by hiding faces on connected boxes.
Added AlphaPass Option to disable AlphaPass Cables rendering ( fixes crash with Immbis Microblocks. )
 2014-05-04 19:51:05 -05:00
AlgorithmX2 66a7e191a4 If you have more then 10,000 of any part it now properly converts to "10k" instead of showing an unlocalized string 2014-05-04 19:24:42 -05:00
AlgorithmX2 4d5a6ce301 Add Stained Glass facades. 
The Item Bus Renderer can now deal with Alpha Pass.
 2014-05-04 15:46:38 -05:00
AlgorithmX2 3c510b6925 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java
 2014-05-03 14:12:19 -05:00
AlgorithmX2 4a2c7c2710 Fixed issue with NEI and font size. 
Added Crafting Terminal Integration for NEI.
Added Inscriber Recipe Plugin for NEI.
 2014-04-30 23:01:22 -05:00
AlgorithmX2 34abc147bc Minimum of 3 rows. 2014-04-26 21:54:08 -05:00
AlgorithmX2 eadd67a34c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-24 02:14:58 -05:00
AlgorithmX2 27b9d0f4cd Energy FX is now much more light weight. 2014-04-24 02:13:52 -05:00
AlgorithmX2 07a98270c3 Fixed #0356 - Scrollbar is locked after right click searchbox 2014-04-24 02:13:33 -05:00
AlgorithmX2 e95da25144 Started Work in MAC Gui. 2014-04-24 01:14:26 -05:00
AlgorithmX2 589e2d60d2 Pattern slots now report the output qty as well as the item type, at all times ( not just when shift is held ) 2014-04-23 00:30:29 -05:00
AlgorithmX2 94951b4209 Render output of pattern when shift is held. 2014-04-23 00:18:44 -05:00
AlgorithmX2 85f15e7c06 Pattern Renderer ( for shift ) 2014-04-22 20:36:26 -05:00
AlgorithmX2 e9759f681e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-20 13:53:43 -05:00
AlgorithmX2 2e71a6530e Added NEI Sync. 2014-04-19 23:35:13 -05:00
AlgorithmX2 cb42ce164c 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
AlgorithmX2 67d46d57d2 Patterns can now be encoded. 
Added a clear button to the Pattern Terminal.
Added description to the Encoded Pattern Item.
 2014-04-17 01:15:56 -05:00
AlgorithmX2 f14581edae Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-16 23:39:03 -05:00
AlgorithmX2 4ee886c6ac Added Pattern Terminal Crafting. 2014-04-16 23:38:43 -05:00
AlgorithmX2 f5fc2ba18e Removed Terminal style from Portable Cell Gui. 
Portable Cell now only shows 3 rows now, like it should.
Security Gui now has the proper width.
Fixed bug introduced in #90 to show background behind security terminal slots.
 2014-04-16 13:48:03 -05:00
AlgorithmX2 71b5fd4555 Hid View Cells on Portable Cell and ME Chest. 2014-04-16 12:16:21 -05:00
AlgorithmX2 506b7a7129 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-14 02:39:39 -05:00
AlgorithmX2 922ade793c Fixed Bug: #0315 - game crashes when ME controller is placed at bedrock level 2014-04-14 02:39:14 -05:00
AlgorithmX2 2de3ab4505 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-10 22:02:23 -05:00
AlgorithmX2 327c1d4118 Ported FMP Support to 1.7. 2014-04-10 14:52:17 -05:00
AlgorithmX2 d84be03027 Large chunk on the pattern terminal. 2014-04-09 23:51:08 -05:00